xfs/235: fix logic errors when checking rmap usage after failures

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/235 b/tests/xfs/235
index c388af18fe4d03ad0d8033d3fa3452c9ceaca6d6..c2e03401d7f811ddba953aceb8bcb639d03c19d4 100755 (executable)
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -80,8 +80,8 @@ echo "+ mount image"
 _scratch_mount
 
 echo "+ copy more"
-$XFS_IO_PROG -f -c "pwrite -S 0x63 0 $((blksz * 64))" -c "fsync" ${SCRATCH_MNT}/file4 >> $seqres.full
-test -s ${SCRATCH_MNT}/file4 || _fail "should not be able to copy with busted rmap btree"
+$XFS_IO_PROG -f -c "pwrite -S 0x63 0 $((blksz * 64))" -c "fsync" ${SCRATCH_MNT}/file4 >> $seqres.full 2>&1
+test -s ${SCRATCH_MNT}/file4 && _fail "should not be able to copy with busted rmap btree"
 umount ${SCRATCH_MNT}
 
 echo "+ repair fs"

diff --git a/tests/xfs/235.out b/tests/xfs/235.out
index 89a11d6305f640ec06a3fa12810d329d94747cd8..7640224e8664bce38637ed52c29e85fa8db05ab6 100644 (file)
--- a/tests/xfs/235.out
+++ b/tests/xfs/235.out
@@ -6,7 +6,6 @@ QA output created by 235
 + corrupt image
 + mount image
 + copy more
-fsync: Structure needs cleaning
 + repair fs
 + mount image (2)
 + chattr -R -i