common/fuzzy: if the fuzz verb is random, keep fuzzing until we get a new value

[xfstests-dev.git] / common / xfs

diff --git a/common/xfs b/common/xfs
index 95dde603cf99930239c38d956db4ad158a051ca0..799a545de72523f1e3c9b8d55972062eccc6228c 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -357,11 +357,15 @@ _check_xfs_filesystem()
        # Run online scrub if we can.
        mntpt="$(_is_mounted $device)"
        if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then
-               "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full 2>&1
+               "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1
                if [ $? -ne 0 ]; then
-                       _log_err "filesystem on $device failed scrub"
+                       _log_err "_check_xfs_filesystem: filesystem on $device failed scrub"
+                       echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full
+                       cat $tmp.scrub >> $seqres.full
+                       echo "*** end xfs_scrub output" >> $serqres.full
                        ok=0
                fi
+               rm -f $tmp.scrub
        fi
 
        if [ "$type" = "xfs" ]; then
@@ -462,13 +466,7 @@ _check_xfs_test_fs()
                TEST_RT="$TEST_RTDEV"
 
        _check_xfs_filesystem $TEST_DEV $TEST_LOG $TEST_RT
-
-       # check for ipath consistency
-       if $XFS_GROWFS_PROG -n $TEST_DIR | grep -q 'inode-paths=1'; then
-               # errors go to stderr
-               xfs_check_ipaths $TEST_DIR >/dev/null
-               xfs_repair_ipaths -n $TEST_DIR >/dev/null
-       fi
+       return $?
 }
 
 _require_xfs_test_rmapbt()