xfs/31[2-7]: hide pwrite fsync errors that are supposed to fail

xfs_io 4.14 will gain the ability to print error messages when
pwrite+fsync fail.  Certain tests use the error injector to cause
failures, so the errors are expected.  Since we test for a shut down
filesystem after the error injection, we can push the error messages to
the log.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/xfs/312 b/tests/xfs/312
index 0c10441427386c80cd721ba86ba58bbb402c1ade..098752747a7b008c58731c67838445d8f83c0920 100755 (executable)
--- a/tests/xfs/312
+++ b/tests/xfs/312
@@ -79,7 +79,7 @@ echo "Inject error"
 _scratch_inject_error "bmap_finish_one"
 
 echo "CoW a few blocks"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full 2>&1
 
 echo "FS should be shut down, touch will fail"
 touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch

diff --git a/tests/xfs/313 b/tests/xfs/313
index 1a2cff20d35558c0548c0e6e3fb85950fc1abd22..0904b57fc3115ea15f38c896db4744d1866f8a61 100755 (executable)
--- a/tests/xfs/313
+++ b/tests/xfs/313
@@ -79,7 +79,7 @@ echo "Inject error"
 _scratch_inject_error "refcount_finish_one"
 
 echo "CoW a few blocks"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full 2>&1
 
 echo "FS should be shut down, touch will fail"
 touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch

diff --git a/tests/xfs/314 b/tests/xfs/314
index ec16c6f37ae6978f89e79e4ea7247fb6599fe178..e2e4d7c559cb01ef88c0707ecad8548410494d9c 100755 (executable)
--- a/tests/xfs/314
+++ b/tests/xfs/314
@@ -81,7 +81,7 @@ echo "Inject error"
 _scratch_inject_error "rmap_finish_one"
 
 echo "CoW a few blocks"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full 2>&1
 
 echo "FS should be shut down, touch will fail"
 touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch

diff --git a/tests/xfs/315 b/tests/xfs/315
index 6170540c0b962ab1360746d0efd8cc1e26e0229b..db2655517fb7065c24685c6837b6dbf55f38dc42 100755 (executable)
--- a/tests/xfs/315
+++ b/tests/xfs/315
@@ -77,7 +77,7 @@ echo "Inject error"
 _scratch_inject_error "free_extent"
 
 echo "CoW a few blocks"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $sz" $SCRATCH_MNT/file1 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $sz" $SCRATCH_MNT/file1 >> $seqres.full 2>&1
 sync
 
 echo "FS should be shut down, touch will fail"

diff --git a/tests/xfs/317 b/tests/xfs/317
index 507c2a9a0ac5b001955264d39b3a23e151b999f9..651a067374a9ea91ef27634562c8a794717f00c5 100755 (executable)
--- a/tests/xfs/317
+++ b/tests/xfs/317
@@ -71,7 +71,7 @@ echo "Inject error"
 _scratch_inject_error "rmap_finish_one"
 
 echo "Write files"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $sz" $SCRATCH_MNT/file1 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz 0 $sz" $SCRATCH_MNT/file1 >> $seqres.full 2>&1
 
 echo "FS should be shut down, touch will fail"
 touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch

diff --git a/tests/xfs/326 b/tests/xfs/326
index 36bdcf486febcc71a82c4695a8b2f6a784180bf7..929d3e6b7ab3d6881c85736bd868afe65eebaa7a 100755 (executable)
--- a/tests/xfs/326
+++ b/tests/xfs/326
@@ -87,7 +87,7 @@ echo "Inject error"
 _scratch_inject_error "refcount_finish_one"
 
 echo "CoW a few blocks"
-$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full
+$XFS_IO_PROG -c "pwrite -W -S 0x67 -b $sz $((10 * blksz)) $((10 * blksz))" $SCRATCH_MNT/file2 >> $seqres.full 2>&1
 
 echo "FS should be shut down, touch will fail"
 touch $SCRATCH_MNT/badfs 2>&1 | _filter_scratch