common: Check the file system consistency on SCRATCH_DEV

There are about 198 tests which requires scratch_dev, but does not check
the file system consistency afterwards. Xfstests infrastructure does not
do it automatically, so fix it by running _check_scratch_fs() after
each test that _require_scratch.

Also remove all the _check_scratch_fs() calls that are not actually needed
and will be covered by the check script.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/check b/check
index b1eaed2620d0d993096611a07c2b61edfd183874..5b76fabd6cab54bfb1b4714725b921c64ef36800 100755 (executable)
--- a/check
+++ b/check
@@ -626,6 +626,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
                try="$try $seqnum"
                n_try=`expr $n_try + 1`
                _check_test_fs
+               test -f ${RESULT_DIR}/require_scratch && _check_scratch_fs
+               rm -f ${RESULT_DIR}/require_scratch
            fi
 
            seq="after_$seqnum"

diff --git a/common/rc b/common/rc
index 2c83340928bbcb32c14e99c4992972610bb64118..be3d3ca0a68895768a05ccc93368a25887a448e5 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -986,6 +986,7 @@ _require_scratch()
             exit 1
         fi
     fi
+    touch ${RESULT_DIR}/require_scratch
 }
 
 # this test needs a logdev

diff --git a/tests/btrfs/024 b/tests/btrfs/024
index cb8a6e452376f9882559f7845ff949fd5c284de2..03d105aa27460471744cb7b92148780796ceea42 100755 (executable)
--- a/tests/btrfs/024
+++ b/tests/btrfs/024
@@ -77,7 +77,6 @@ _scratch_mkfs > /dev/null 2>&1
 _scratch_mount "-o compress-force=no"
 __workout
 _scratch_unmount
-_check_scratch_fs
 
 echo "*** done"
 status=0 ; exit

diff --git a/tests/btrfs/043 b/tests/btrfs/043
index b1fef9699e4bebd160605f840fabd9124306dbff..4993349c107fffb3f1b8c31bb3d383a6054be992 100644 (file)
--- a/tests/btrfs/043
+++ b/tests/btrfs/043
@@ -143,7 +143,5 @@ run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap
 run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/044 b/tests/btrfs/044
index dae189e0c81f64fbf0711106cef6cde91fb61143..5565b869c7b6dc3910159c3250f268a0db617799 100644 (file)
--- a/tests/btrfs/044
+++ b/tests/btrfs/044
@@ -123,7 +123,5 @@ run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap
 run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/045 b/tests/btrfs/045
index 4567a3f50086a988c493dd9d93fe0e3d5baadc2c..8570fa6477b9717d0c6276215db86ad339041905 100755 (executable)
--- a/tests/btrfs/045
+++ b/tests/btrfs/045
@@ -370,7 +370,5 @@ run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $tmp/2.snap
 run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/046 b/tests/btrfs/046
index 685e359f070455ac71a78b3d7739b1e0039ba8bc..c0d10e1b631c388b8517ae7dca75f470eafcab2d 100644 (file)
--- a/tests/btrfs/046
+++ b/tests/btrfs/046
@@ -298,7 +298,5 @@ echo "File digests in the replica filesystem:"
 md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch
 md5sum $SCRATCH_MNT/mysnap2/foo | _filter_scratch
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/047 b/tests/btrfs/047
index 2dc6499be973e706051809a0082965240c9cd5ff..8b20e79e9c460fb94146e92805b57e43fd18fd41 100755 (executable)
--- a/tests/btrfs/047
+++ b/tests/btrfs/047
@@ -116,7 +116,5 @@ $XFS_IO_PROG -r -c "seek -r -a 0" $SCRATCH_MNT/mysnap2/foo
 # the file's size.
 $XFS_IO_PROG -r -c "fiemap -v" $SCRATCH_MNT/mysnap2/foo | _filter_fiemap
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/048 b/tests/btrfs/048
index e998f97e4c0f453292d14679730ca73b47636d69..2a9bfc396511aab237945d6b46538fa8fc0a3ec1 100755 (executable)
--- a/tests/btrfs/048
+++ b/tests/btrfs/048
@@ -214,7 +214,5 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1 compression
 touch $SCRATCH_MNT/sv1/file2
 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1/file2 compression
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/050 b/tests/btrfs/050
index 6e4bd13592258b44afdd63d0a5e2e448843fb0b4..9079408531461e8f0fcbb9943f142d78f3d8d5b1 100755 (executable)
--- a/tests/btrfs/050
+++ b/tests/btrfs/050
@@ -103,7 +103,5 @@ _scratch_mount
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/1.snap
 run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/051 b/tests/btrfs/051
index 53df66433b2b5c5fa3b8b6628cc0f5bfd8ba8c6a..deaa7654562fa6e0b6648670211c3c5298488ec5 100755 (executable)
--- a/tests/btrfs/051
+++ b/tests/btrfs/051
@@ -79,7 +79,5 @@ _scratch_mount
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/1.snap
 run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/053 b/tests/btrfs/053
index 399411073c942e4ece9a4f0e7dc8b5cd7fe14d7b..7eef55ffc77f9caa12060bb8b5fb2fa70f2caa03 100755 (executable)
--- a/tests/btrfs/053
+++ b/tests/btrfs/053
@@ -103,7 +103,5 @@ run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
 _run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/2.snap
 run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/btrfs/054 b/tests/btrfs/054
index 215861c3134ced2d803bc8e8cd631bbfa2fb9326..258eead547ef4e0582ec5e8fa05ea3c3db737834 100755 (executable)
--- a/tests/btrfs/054
+++ b/tests/btrfs/054
@@ -103,7 +103,5 @@ _run_btrfs_util_prog receive $SCRATCH_MNT -f $send_files_dir/2.snap
 [ -e $SCRATCH_MNT/testdir ] && \
        echo "Directory testdir was supposed to be deleted after incremental send!"
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/ext4/271 b/tests/ext4/271
index 274e904cda0e8113c2c97056cd6371414569d465..e77ae57fd8874d1f59af83ce0bac395745568509 100755 (executable)
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -62,6 +62,5 @@ if ! _scratch_unmount; then
        exit
 fi
 echo "Check filesystem"
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/ext4/301 b/tests/ext4/301
index 0ca3622f7a0db6beea146b224fe87c8498b903f6..568327d4e40cf3c9755ba38c7b54ad0815cceeff 100755 (executable)
--- a/tests/ext4/301
+++ b/tests/ext4/301
@@ -121,5 +121,4 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0

diff --git a/tests/ext4/302 b/tests/ext4/302
index 497f4c6264bcdcf461bd43bba4c7f37ea834a284..1e90016ced07fa84ee2f55c1e88ce335cca145f6 100755 (executable)
--- a/tests/ext4/302
+++ b/tests/ext4/302
@@ -137,6 +137,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/ext4/303 b/tests/ext4/303
index 93354e5f983d114ec06430c91312352851670515..957387261d409af537dae73fad9f2c2b9302e477 100755 (executable)
--- a/tests/ext4/303
+++ b/tests/ext4/303
@@ -147,6 +147,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/ext4/304 b/tests/ext4/304
index 74e601a89375ac929b778705b56bfe04e05f6ff4..b9b435680a42ef6fe35e82e9c30c66281ef4c786 100755 (executable)
--- a/tests/ext4/304
+++ b/tests/ext4/304
@@ -124,6 +124,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/009 b/tests/generic/009
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tests/generic/019 b/tests/generic/019
index 7a019ad6e48eb9798f9a151cc95e9be220199dca..b387507159e455cae49efbe75551c6da435fe51f 100755 (executable)
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -171,7 +171,6 @@ _workout()
        # perform mount/umount, after that all errors should be fixed
        run_check _scratch_mount
        run_check _scratch_unmount
-       _check_scratch_fs
 }
 
 # real QA test starts here

diff --git a/tests/generic/026 b/tests/generic/026
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tests/generic/027 b/tests/generic/027
index b9232ec2e5f23b1c6e3777ca4eb7b4d15ff2a174..8dab117c8b4cb9e7c19a26f9578b23587f2fc806 100755 (executable)
--- a/tests/generic/027
+++ b/tests/generic/027
@@ -101,7 +101,6 @@ while [ $i -le $loop ]; do
        let i=$i+1
 done
 _scratch_unmount
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/generic/068 b/tests/generic/068
index a76401963a10dd277b8a33db5db59b3107bf2b86..77943265acde4dc458b5694ffcf2310a3185420f 100755 (executable)
--- a/tests/generic/068
+++ b/tests/generic/068
@@ -130,6 +130,4 @@ rm $tmp.running
 # wait for fsstresses to finish
 wait
 
-_check_scratch_fs
-
 exit 1

diff --git a/tests/generic/076 b/tests/generic/076
index a53840feb70c6bf2d905f65eca641ad315adabe7..02af7621903a04e0aba9e55a5e4a891e730de2f7 100755 (executable)
--- a/tests/generic/076
+++ b/tests/generic/076
@@ -77,7 +77,6 @@ FSSTRESS_ARGS=`_scale_fsstress_args -p 2 -n 2000 $FSSTRESS_AVOID`
 echo "run fsstress with args: $FSSTRESS_ARGS" >>$seqres.full
 $FSSTRESS_PROG $FSSTRESS_ARGS >>$seqres.full
 _lets_get_pidst
-_check_scratch_fs
 
 echo "*** done"
 status=0

diff --git a/tests/generic/083 b/tests/generic/083
index f9135f84be03d240d9fedec28cc41032efee0eef..61316bff2e7bbedf8e9c3f4712271da9407e7175 100755 (executable)
--- a/tests/generic/083
+++ b/tests/generic/083
@@ -84,7 +84,6 @@ workout()
        # -w ensures that the only ops are ones which cause write I/O
        FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs -n $nops $FSSTRESS_AVOID`
        $FSSTRESS_PROG $FSSTRESS_ARGS >>$seqres.full
-       _check_scratch_fs
 }
 
 echo "*** test out-of-space handling for random write operations"

diff --git a/tests/generic/097 b/tests/generic/097
index c1204227d81868c338f57cec2beb01123cd4f52d..f40d5d5d1160310df580f1a71d4459d2ee74e511 100755 (executable)
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -244,13 +244,6 @@ ${ATTR_PROG} -R -l foo
 
 cd /
 
-# Check the filesystem
-_check_scratch_fs
-
-# optional stuff if your test has verbose output to help resolve problems
-#echo
-#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)"
-
 # success, all done
 status=0
 exit

diff --git a/tests/generic/099 b/tests/generic/099
index 735196640961d9d489d423f0ec78668ad1686ce7..83097e915b329c396753809515095b2bd2337795 100755 (executable)
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -328,13 +328,6 @@ chacl $acl3 largeaclfile
 _acl_list largeaclfile | _filter_aces_notypes
 
 #-------------------------------------------------------
-
-if [ "$FSTYP" == "udf" ]; then
-    cd /
-    umount $TARGET_DIR
-    # Check the filesystem
-    _check_scratch_fs
-fi
 # success, all done
 status=0
 exit

diff --git a/tests/generic/100 b/tests/generic/100
index 05d766fad04cb2477b14f0160a5723438d2ef922..00ba23edddf94332bdf38ed9725f70edcb4734c0 100755 (executable)
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -80,7 +80,6 @@ ls -R -l ${TEST_DIR}${POPULATED_DIR} >>$seqres.full 2>&1
 diff -qr $POPULATED_DIR ${TEST_DIR}${POPULATED_DIR}
 
 cd /
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/generic/117 b/tests/generic/117
index f81265b2cdeecc0bd2ad6ab21f57740c13ff09ec..935dcafb8c812f780c0680c94cea400deba33eff 100755 (executable)
--- a/tests/generic/117
+++ b/tests/generic/117
@@ -108,8 +108,6 @@ cd /
 umount $SCRATCH_MNT
 echo 
 echo Checking filesystem
-_check_scratch_fs
-_scratch_mount
 
 status=$?
 exit

diff --git a/tests/generic/124 b/tests/generic/124
index 93ec4a1e38c48dd1661f6d286e2997bc9df92837..77f6e7d72b54ca1d26a3690725111638017c61b7 100755 (executable)
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -76,7 +76,4 @@ fi
 
 umount $SCRATCH_DEV
 
-_check_test_fs
-_check_scratch_fs
-
 exit 

diff --git a/tests/generic/204 b/tests/generic/204
index de029c6324717ada1f6784bf77dea5a34b905608..d6bb094e065658e7ed5395bb857549c2c612d7a6 100755 (executable)
--- a/tests/generic/204
+++ b/tests/generic/204
@@ -83,8 +83,6 @@ for i in `seq 1 $files`; do
     echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX > $SCRATCH_MNT/$i
 done
 
-_check_scratch_fs
-
 # success, all done
 echo "*** done"
 status=0

diff --git a/tests/generic/269 b/tests/generic/269
index 684cf42a4e28440565da15fe8d3fef57743da8a6..cff5e54d8a94483cf3b5cb6e656de82e43855c31 100755 (executable)
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -79,6 +79,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/270 b/tests/generic/270
index b5ed7af68727efcc31389a119d536ea7f1480dfd..cebd377ef670b9150c6ae9efcbd287515e6eda6c 100755 (executable)
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -104,6 +104,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/273 b/tests/generic/273
index 8e121a2605567a8c18524c82b6aa401ea1ec77ff..1ceb6c4af646cf692839ddb045080b2d7fe84e5e 100755 (executable)
--- a/tests/generic/273
+++ b/tests/generic/273
@@ -138,6 +138,5 @@ _scratch_mount
 
 _do_workload
 
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/299 b/tests/generic/299
index bf02c9447738f067e3b8cd659ba2762432ac3585..e8685a42c5b276aba727dd7e2cca1a1908a15160 100755 (executable)
--- a/tests/generic/299
+++ b/tests/generic/299
@@ -152,6 +152,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/300 b/tests/generic/300
index 01d460032d1b3b96dc04cb63c3d71fd7f4e9643f..5234d05a1e39f7461fb91908a690df5b04a5da25 100755 (executable)
--- a/tests/generic/300
+++ b/tests/generic/300
@@ -155,6 +155,5 @@ if ! _scratch_unmount; then
        status=1
        exit
 fi
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/generic/312 b/tests/generic/312
index 7611bb9ae841afa667a34f59654bf4e420af7776..b0359786a6cbc4f5f63e6698e51177c693ad7583 100755 (executable)
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -67,6 +67,5 @@ echo "Silence is golden"
 $XFS_IO_PROG -f -c "falloc 0 6g" $SCRATCH_MNT/testfile.$seq >>$seqres.full 2>&1
 
 _scratch_unmount
-_check_scratch_fs
 status=0
 exit

diff --git a/tests/generic/315 b/tests/generic/315
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tests/generic/320 b/tests/generic/320
index e1ba970eae9393497ed3f586627f285e3d07cec2..3dd3bead33c7ec4229271e1e6b015d58ad071036 100755 (executable)
--- a/tests/generic/320
+++ b/tests/generic/320
@@ -116,6 +116,5 @@ _scratch_mount >>$seqres.full 2>&1
 
 do_workload
 
-_check_scratch_fs
 status=0
 exit

diff --git a/tests/generic/321 b/tests/generic/321
old mode 100644 (file)
new mode 100755 (executable)
index 345416c..8410d40
--- a/tests/generic/321
+++ b/tests/generic/321
@@ -121,8 +121,6 @@ _replay_rename_test()
        _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }'
        _ls_l $SCRATCH_MNT/bar | tail -n +2 | awk '{ print $1, $9 }'
        _unmount_flakey
-       _check_scratch_fs $FLAKEY_DEV
-       [ $? -ne 0 ] && _fatal "fsck failed"
 }
 
 _scratch_mkfs >> $seqres.full 2>&1

diff --git a/tests/generic/322 b/tests/generic/322
old mode 100644 (file)
new mode 100755 (executable)
index c43fcb1..fe1a4d5
--- a/tests/generic/322
+++ b/tests/generic/322
@@ -94,8 +94,6 @@ _write_after_fsync_rename_test()
        _mount_flakey
        md5sum $SCRATCH_MNT/bar | _filter_scratch
        _unmount_flakey
-       _check_scratch_fs $FLAKEY_DEV
-       [ $? -ne 0 ] && _fatal "fsck failed"
 }
 
 _scratch_mkfs >> $seqres.full 2>&1

diff --git a/tests/shared/006 b/tests/shared/006
index 445c35d6ee70acafda5bd3407bc30ba87ebde958..55c596593d39b6716ab4cc7ee0138f578c440e6a 100755 (executable)
--- a/tests/shared/006
+++ b/tests/shared/006
@@ -91,7 +91,6 @@ _check_scratch_fs
 rm -rf $SCRATCH_MNT/testdir
 echo "Inode status after deleting all test files" >>$seqres.full
 $DF_PROG -i $SCRATCH_MNT >>$seqres.full
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/shared/272 b/tests/shared/272
index 0f812f372eb00576f13802d6342bcad6b9b89c9d..4417535cf3425f271063afc34419066193a7fdc0 100755 (executable)
--- a/tests/shared/272
+++ b/tests/shared/272
@@ -103,6 +103,5 @@ if ! _scratch_unmount; then
        exit
 fi
 echo "Check filesystem"
-_check_scratch_fs
-status=$?
+status=0
 exit

diff --git a/tests/xfs/010 b/tests/xfs/010
index 2b5ad00570c681dfdcd5305fbdcbc80dc90eb967..fd2e27cd045e6c9c3a79daad862f2739dd8807a5 100755 (executable)
--- a/tests/xfs/010
+++ b/tests/xfs/010
@@ -127,7 +127,6 @@ _check_scratch_fs
 _corrupt_finobt_root $SCRATCH_DEV
 
 _scratch_xfs_repair 2>&1 | _filter_repair
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/xfs/011 b/tests/xfs/011
index 5763af9a81df7441550d426d1eaaf037734ddc66..658a8224e2c6984b080710515ef0ff912b4759ce 100755 (executable)
--- a/tests/xfs/011
+++ b/tests/xfs/011
@@ -110,7 +110,6 @@ killall $FSSTRESS_PROG
 wait
 
 umount $SCRATCH_MNT
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/xfs/013 b/tests/xfs/013
index d47bf53bd40d60cc0bfa7b59175d01b201af2924..dea3d081cdbe70f60ad356add264d39cf9f3b8d1 100755 (executable)
--- a/tests/xfs/013
+++ b/tests/xfs/013
@@ -150,7 +150,6 @@ rm -rf $SCRATCH_MNT/fsstress
 rm -rf $SCRATCH_MNT/dir*
 
 umount $SCRATCH_MNT
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/xfs/014 b/tests/xfs/014
index 1e092a9566c7eb4983ac686f03eded33b3e38a72..8866bfe44cda601525b02647955028cffbcfc3b0 100755 (executable)
--- a/tests/xfs/014
+++ b/tests/xfs/014
@@ -194,7 +194,6 @@ umount $LOOP_MNT
 echo $orig_sp_time > /proc/sys/fs/xfs/speculative_prealloc_lifetime
 
 umount $SCRATCH_MNT
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/xfs/019 b/tests/xfs/019
index d35d15b95375c1ad5a8ce6780633617d53052e9c..09670b9fb07c9ee98608a768f69993553932fa33 100755 (executable)
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -136,9 +136,6 @@ _verify_fs()
        _full "umount"
        umount $SCRATCH_DEV >>$seqfull 2>&1 \
                || _fail "umount failed"
-
-       echo "*** check FS"
-       _check_scratch_fs
 }
 
 #_verify_fs 1

diff --git a/tests/xfs/019.out b/tests/xfs/019.out
index 0c1bf8f18146da202e0f6f1c2955dd55861e7c14..19614d9d4103717ca43a012e578ce033f44ad54f 100644 (file)
--- a/tests/xfs/019.out
+++ b/tests/xfs/019.out
@@ -79,6 +79,5 @@ Device: <DEVICE> Inode: <INODE> Links: 1
  Mode: (0123/l--x-w--wx) Uid: (0) Gid: (0)
 Device: <DEVICE> Inode: <INODE> Links: 1 
 *** unmount FS
-*** check FS
 *** done
 *** unmount

diff --git a/tests/xfs/034 b/tests/xfs/034
index 6f73fdd3b355a16baf5137ed8fec3911d4539d08..6beeb56161ce2dee80b07dd2d53ecd6e9e2b3d99 100755 (executable)
--- a/tests/xfs/034
+++ b/tests/xfs/034
@@ -83,8 +83,6 @@ then
 fi
 
 # pv 801241 causes corruption here (inode left in agi_unlinked list)
-_check_scratch_fs
-
 echo "*** done"
 # happy exit
 status=0

diff --git a/tests/xfs/042 b/tests/xfs/042
index db0fa28485192d0db508aac2fd34644b62ed5c70..77dd7048a570e704a0935041c12868fd710d02e0 100755 (executable)
--- a/tests/xfs/042
+++ b/tests/xfs/042
@@ -162,7 +162,6 @@ if ! _do "diff $tmp.sum1 $tmp.sum2"; then
     status=1; exit
 fi
 echo "done"
-_do "Checking filesystem" "_check_scratch_fs"
 
 # success, all done
 echo "xfs_fsr tests passed."

diff --git a/tests/xfs/042.out b/tests/xfs/042.out
index f5b37b373098415c9a49a93be20a16de41293d94..41baf09481f8330335b47b135e6e4f4283097def 100644 (file)
--- a/tests/xfs/042.out
+++ b/tests/xfs/042.out
@@ -9,5 +9,4 @@ Remove other files... done
 Run xfs_fsr on filesystem... done
 Check fill file... done
 Check large file... done
-Checking filesystem... done
 xfs_fsr tests passed.

diff --git a/tests/xfs/085 b/tests/xfs/085
index af71b77b00fbf3f50350547dc7a2a232a5122006..54c2d018f7e869185870ee70a8181c0d5365bd1b 100755 (executable)
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -88,12 +88,6 @@ umount $SCRATCH_MNT
 echo "logprint after mount and replay..."
 _print_logstate
 
-if _check_scratch_fs; then
-    echo "filesystem is checked ok"
-else
-    echo "filesystem is NOT ok"
-fi
-
 # success, all done
 status=0
 exit

diff --git a/tests/xfs/085.out b/tests/xfs/085.out
index 48e3e73275f25322cdbbe2cc782dd2e087becf1f..d2d99a11122f14853e1e271e619ce2ca36e33bd3 100644 (file)
--- a/tests/xfs/085.out
+++ b/tests/xfs/085.out
@@ -111,4 +111,3 @@ ls SCRATCH_MNT
 unmount
 logprint after mount and replay...
 clean log
-filesystem is checked ok

diff --git a/tests/xfs/104 b/tests/xfs/104
index e899acac7b1f61c6e17d9d7deaaf53b43786d7b7..69fcc69ee2f8302bc272d2ecd45cd7d071cf8910 100755 (executable)
--- a/tests/xfs/104
+++ b/tests/xfs/104
@@ -113,7 +113,6 @@ done
 wait   # stop for any remaining stress processes
 
 umount $SCRATCH_DEV
-_check_scratch_fs
 
 status=0
 exit

diff --git a/tests/xfs/110 b/tests/xfs/110
index 48bea452c88c4c2873c655f9ceb15cee17218d41..7428faf62679256c35ecd1efa59ea2bc5305d575 100755 (executable)
--- a/tests/xfs/110
+++ b/tests/xfs/110
@@ -81,7 +81,5 @@ do
 done
 wait
 
-_check_scratch_fs
-
 status=0
 exit

diff --git a/tests/xfs/121 b/tests/xfs/121
index 1e06e45aff715c43330ce19ef33e3aad1e432a5f..1457ed1e366c653337bfef1325027137ab71db35 100755 (executable)
--- a/tests/xfs/121
+++ b/tests/xfs/121
@@ -106,9 +106,6 @@ fi
 _scratch_mount >> $seqres.full 2>&1 \
     || _fail "mount failed"
 
-# should now be peaches
-_check_scratch_fs
-
 # success, all done
 status=0
 exit

diff --git a/tests/xfs/181 b/tests/xfs/181
index 38d556cf6e3d953f65a7c807289b9560a7077101..4e7ac3a95ff9db133362d0893b6de774a376eea7 100755 (executable)
--- a/tests/xfs/181
+++ b/tests/xfs/181
@@ -120,9 +120,6 @@ fi
 _scratch_mount >> $seqres.full 2>&1 \
     || _fail "mount failed"
 
-# should now be peaches
-_check_scratch_fs
-
 # success, all done
 status=0
 exit

diff --git a/tests/xfs/278 b/tests/xfs/278
index dacd1fcf06c9e37705f22fc7673394bc683af9aa..2b1db8a2fe69e02b5c31cd4d3c2b210aa001f60e 100755 (executable)
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -78,9 +78,4 @@ echo "" >>$seqres.full
 xfs_repair  $SCRATCH_DEV >> $seqres.full 2>&1
 echo "===== END of xfs_repair =====" >> $seqres.full
 
-#if _check_scratch_fs; then
-#      status=0
-#else
-#      status=1
-#fi
 exit

diff --git a/tests/xfs/297 b/tests/xfs/297
index 3fe32f1a4d880ca739b81dbaad78db76aca9cf7b..1cdbbb9ee6c8de12b0b72166fb6e1db18e01ac23 100755 (executable)
--- a/tests/xfs/297
+++ b/tests/xfs/297
@@ -82,6 +82,5 @@ echo "Test done" | tee -a $seqres.full
 killall -q $FSSTRESS_PROG
 wait
 
-_check_scratch_fs
 status=0
 exit

diff --git a/tests/xfs/306 b/tests/xfs/306
index 0794de3fd13cbfdad419049f0c26d53d5d8fb5ae..3053fd92ae8837fec6075cd7c35903eef70f8d00 100644 (file)
--- a/tests/xfs/306
+++ b/tests/xfs/306
@@ -97,7 +97,6 @@ for d in $load_dir/*; do
 done
 wait
 umount $SCRATCH_MNT
-_check_scratch_fs
 
 echo "No output is good. Failures are loud."