xfs: add _require_non_zoned_device calls

Add _require_non_zoned_device calls to various XFS-specific tests.
Mostly this is because they force v4 file systems or other features
that can't work on zoned devices.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/tests/xfs/033 b/tests/xfs/033
index e0b0dd58212d61571db5c1ea18410a37f27d1345..848984d42d8b75c4f8afa99177afe8f3b70d305e 100755 (executable)
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -48,6 +48,8 @@ _filter_bad_ids()
        grep -E -v 'bad user id 0xffffffff|bad group id 0xffffffff'
 }
 
+# RT requires metadir (this needs a better check..)
+_require_non_zoned_device $SCRATCH_RTDEV
 
 _require_scratch
 _require_no_large_scratch_dev

diff --git a/tests/xfs/178 b/tests/xfs/178
index 0cc0e3f5bb88b4e1505fcd8751b2078a5319e7ea..f0438f1ec4615b8827f57340690abf2ccdde929d 100755 (executable)
--- a/tests/xfs/178
+++ b/tests/xfs/178
@@ -51,6 +51,10 @@ _dd_repair_check()
 
 _require_scratch
 _scratch_xfs_force_no_metadir
+# zoned requires metadir.
+# XXX: this should probably go into _scratch_xfs_force_no_metadir
+_require_non_zoned_device $SCRATCH_RTDEV
+
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
 
 # By executing the followint tmp file, will get on the mkfs options stored in

diff --git a/tests/xfs/1856 b/tests/xfs/1856
index 9f43aa32f6f42f141768246a59b517a0153378d5..9ef099ee42153c15bba35c204d182811fed84287 100755 (executable)
--- a/tests/xfs/1856
+++ b/tests/xfs/1856
@@ -16,6 +16,9 @@ _require_check_dmesg
 _require_scratch_nocheck
 _require_scratch_xfs_crc
 
+# zoned requires metadir and doesn't support old features
+_require_non_zoned_device $SCRATCH_RTDEV
+
 # Does repair know how to add a particular feature to a filesystem?
 check_repair_upgrade()
 {

diff --git a/tests/xfs/419 b/tests/xfs/419
index b9cd21faf443c6fbc8c48c21731c8641ec3a3c2e..614a145e9166ac120858e30cb8a9906a872a5500 100755 (executable)
--- a/tests/xfs/419
+++ b/tests/xfs/419
@@ -28,6 +28,9 @@ _begin_fstest auto quick realtime mkfs
 _require_realtime
 _require_scratch
 
+# no extsize support on zoned file systems
+_require_non_zoned_device $SCRATCH_RTDEV
+
 # Check mkfs.xfs option parsing with regards to rtinherit.  XFS doesn't require
 # the realtime volume to be present to set rtinherit, so it's safe to call the
 # mkfs binary directly, in dry run mode, with exactly the parameters we want to

diff --git a/tests/xfs/540 b/tests/xfs/540
index 3acb20951a562bf89ec4a5a01698f0e77e0affcd..aadcd47046573d30f64ecd87b29f83de09b166fb 100755 (executable)
--- a/tests/xfs/540
+++ b/tests/xfs/540
@@ -25,6 +25,9 @@ _begin_fstest auto repair fuzzers
 
 _require_scratch
 
+# zoned RT devices don't support rtextsize
+_require_non_zoned_device $SCRATCH_RTDEV
+
 echo "Format and mount"
 _scratch_mkfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs
 cat $tmp.mkfs >> $seqres.full

diff --git a/tests/xfs/556 b/tests/xfs/556
index 83d5022e700c8bec58f86aed6194d345090a1ef0..17100ea19a69b9e6896e29d0455d64e2019b324d 100755 (executable)
--- a/tests/xfs/556
+++ b/tests/xfs/556
@@ -28,6 +28,12 @@ _require_scratch_xfs_crc
 _require_scrub
 _require_dm_target error
 
+#
+# The dm-error map added by this test doesn't work on zoned devices
+# because table sizes need to be aligned to the zone size.
+#
+_require_non_zoned_device $SCRATCH_RTDEV
+
 filter_scrub_errors() {
        _filter_scratch | sed \
                -e "s/offset $((fs_blksz * 2)) /offset 2FSB /g" \