xfs/6{59-61}: force xfs_healer to run

Set the autofsck property so that xfs_healer actually runs on
filesystems with old feature sets.  Since these tests are looking for
error reports that don't require backref metadata (media errors, file IO
errors, shutdowns) we needn't _notrun them.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/xfs/659 b/tests/xfs/659
index 6d17711a07b11890a94a756ce69572feea715add..556c1991a3c467dba8861543141c868004aba216 100755 (executable)
--- a/tests/xfs/659
+++ b/tests/xfs/659
@@ -26,6 +26,7 @@ _cleanup()
 _require_scratch
 _require_scrub
 _require_command "$XFS_HEALER_PROG" "xfs_healer"
+_require_command "$XFS_PROPERTY_PROG" "xfs_property"
 _require_dm_target error
 _require_no_xfs_always_cow     # no out of place writes
 
@@ -59,6 +60,8 @@ _scratch_mkfs >> $seqres.full
 #
 _scratch_mount
 _require_xfs_scratch_non_zoned
+# Force xfs_healer to run even if there's no backref metadata
+$XFS_PROPERTY_PROG $SCRATCH_MNT set autofsck=check >> $seqres.full
 _require_xfs_healer $SCRATCH_MNT
 _scratch_unmount
 

diff --git a/tests/xfs/660 b/tests/xfs/660
index 214dfe1a15b130b2fa82d7e483f0af72b8d68026..962a2fc78353ffaa1a85e35d0d27e7ebeed824ef 100755 (executable)
--- a/tests/xfs/660
+++ b/tests/xfs/660
@@ -25,6 +25,7 @@ _require_scratch
 _require_scrub
 _require_dm_target error
 _require_command "$XFS_HEALER_PROG" "xfs_healer"
+_require_command "$XFS_PROPERTY_PROG" "xfs_property"
 _require_xfs_io_command verifymedia
 
 filter_healer() {
@@ -57,6 +58,8 @@ _scratch_mkfs >> $seqres.full
 _scratch_mount
 _require_xfs_scratch_non_zoned
 _require_xfs_healer $SCRATCH_MNT
+# Force xfs_healer to run even if there's no backref metadata
+$XFS_PROPERTY_PROG $SCRATCH_MNT set autofsck=check >> $seqres.full
 _scratch_unmount
 
 _dmerror_init

diff --git a/tests/xfs/661 b/tests/xfs/661
index f3f74cfe582c5176356448b65886ca5afdf13f93..45e095395365f53fc1d18628b762f3b011815858 100755 (executable)
--- a/tests/xfs/661
+++ b/tests/xfs/661
@@ -16,10 +16,14 @@ _begin_fstest auto quick scrub eio selfhealing shutdown
 _require_scratch_nocheck
 _require_scrub
 _require_command "$XFS_HEALER_PROG" "xfs_healer"
+_require_command "$XFS_PROPERTY_PROG" "xfs_property"
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
 _require_xfs_healer $SCRATCH_MNT
+# Force xfs_healer to run even if there's no backref metadata
+$XFS_PROPERTY_PROG $SCRATCH_MNT set autofsck=check >> $seqres.full
+
 $XFS_IO_PROG -f -c "pwrite -S 0x58 0 500k" -c "fsync" $victim >> $seqres.full
 
 echo "Start healer and shut down"