[PATCH 11/17] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir

[Christoph Hellwig <hch@lst.de>]

Zoned file systems required the metadir feature.  If the tests are run
on a conventional block device as the RT device, we can simply remove
the zoned flag an run the test, but if the file systems sits on a zoned
block device there is no way to run a test that wants a non-metadir
file system.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 common/xfs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/xfs b/common/xfs
index 86953b7310d9..a18b721eb5cf 100644
--- a/common/xfs
+++ b/common/xfs
@@ -2054,6 +2054,12 @@ _scratch_xfs_find_metafile()
 # Force metadata directories off.
 _scratch_xfs_force_no_metadir()
 {
+	_require_non_zoned_device $SCRATCH_DEV
+	# metadir is required for when the rt device is on a zoned device
+	if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then
+		_require_non_zoned_device $SCRATCH_RTDEV
+	fi
+
 	# Remove any mkfs-time quota options because those are only supported
 	# with metadir=1
 	for opt in uquota gquota pquota; do
@@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir()
 	if grep -q 'metadir=' $MKFS_XFS_PROG; then
 		MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS"
 	fi
+
+	# zoned requires metadir
+	if grep -q 'zoned=' $MKFS_XFS_PROG; then
+		MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS"
+	fi
 }
 
 # do not run on zoned file systems
-- 
2.45.2