common/rc: avoid mixed mode for zoned btrfs

[xfstests-dev.git] / common / rc

diff --git a/common/rc b/common/rc
index e2d3d72a00f6535ee4a5cb9ba2978e6db6b55e2b..d326572f08f407f33af27d032c45c8a300523ee6 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1078,10 +1078,10 @@ _scratch_mkfs_sized()
                ;;
        btrfs)
                local mixed_opt=
-               # minimum size that's needed without the mixed option.
-               # Ref: btrfs-prog: btrfs_min_dev_size()
-               # Non mixed mode is also the default option.
-               (( fssize < $((256 * 1024 *1024)) )) && mixed_opt='--mixed'
+               # Mixed option is required when the filesystem size is small and
+               # the device is not zoned. Ref: btrfs-progs: btrfs_min_dev_size()
+               (( fssize < $((256 * 1024 * 1024)) )) &&
+                       ! _scratch_btrfs_is_zoned && mixed_opt='--mixed'
                $MKFS_BTRFS_PROG $MKFS_OPTIONS $mixed_opt -b $fssize $SCRATCH_DEV
                ;;
        jfs)