xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs

Check for a few errors issued for unsupported zoned configurations in
_try_scratch_mkfs_xfs so that the test is not run instead of failed.

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

diff --git a/common/xfs b/common/xfs
index 96c15f3c7bb0a99d00527bafcce05191b2d9febe..39650bac6c235adbd112fdb84d56f526b7a29d9f 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -160,6 +160,11 @@ _try_scratch_mkfs_xfs()
 
        grep -q crc=0 $tmp.mkfsstd && _force_xfsv4_mount_options
 
+       grep -q "zoned file systems do not support" $tmp.mkfserr && \
+               _notrun "Not supported on zoned file systems"
+       grep -q "must be greater than the minimum zone count" $tmp.mkfserr && \
+               _notrun "Zone count too small"
+
        if [ $mkfs_status -eq 0 -a "$LARGE_SCRATCH_DEV" = yes ]; then
                # manually parse the mkfs output to get the fs size in bytes
                local fs_size