From: Shin'ichiro Kawasaki Date: Tue, 22 Feb 2022 04:19:08 +0000 (+0900) Subject: common/rc: avoid mixed mode for zoned btrfs X-Git-Tag: v2022.05.01~69 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7fad8609aedb4640b8a09162a630f1a10707228e;p=xfstests-dev.git common/rc: avoid mixed mode for zoned btrfs When the helper function _scratch_mkfs_sized is called with small filesystem size and FSTYP=btrfs, it calls mkfs.btrfs with --mixed option to enable mixed mode. However, mkfs.btrfs with --mixed option fails for zoned block devices since btrfs does not support mixed mode together with zoned mode. To avoid this failure, do not set --mixed option when the scratch device is a zoned block device. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Naohiro Aota Signed-off-by: Eryu Guan --- diff --git a/common/rc b/common/rc index e2d3d72a..d326572f 100644 --- 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)