common/config: remove default 4k blocksize from XFS_MKFS_OPTIONS

[xfstests-dev.git] / common / config

diff --git a/common/config b/common/config
index 285b7d1fae3292df96aad731bcadf01152d83881..adc16b59ffa26e54f6828f9561eeedc8a545f44c 100644 (file)
--- a/common/config
+++ b/common/config
@@ -60,7 +60,6 @@ export EMAIL=root@localhost    # where auto-qa will send its status messages
 export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
 export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
-export XFS_MKFS_OPTIONS=${XFS_MKFS_OPTIONS:=-bsize=4096}
 export TIME_FACTOR=${TIME_FACTOR:=1}
 export LOAD_FACTOR=${LOAD_FACTOR:=1}
 export DEBUGFS_MNT=${DEBUGFS_MNT:="/sys/kernel/debug"}
@@ -156,6 +155,7 @@ MKSWAP_PROG="$MKSWAP_PROG -f"
 export XFS_LOGPRINT_PROG="$(type -P xfs_logprint)"
 export XFS_REPAIR_PROG="$(type -P xfs_repair)"
 export XFS_DB_PROG="$(type -P xfs_db)"
+export XFS_METADUMP_PROG="$(type -P xfs_metadump)"
 export XFS_ADMIN_PROG="$(type -P xfs_admin)"
 export XFS_GROWFS_PROG=$(type -P xfs_growfs)
 export XFS_SPACEMAN_PROG="$(type -P xfs_spaceman)"
@@ -224,6 +224,8 @@ export CC_PROG="$(type -P cc)"
 export FSVERITY_PROG="$(type -P fsverity)"
 export OPENSSL_PROG="$(type -P openssl)"
 export ACCTON_PROG="$(type -P accton)"
+export E2IMAGE_PROG="$(type -P e2image)"
+export BLKZONE_PROG="$(type -P blkzone)"
 
 # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
 # newer systems have udevadm command but older systems like RHEL5 don't.
@@ -410,6 +412,12 @@ _mkfs_opts()
        f2fs)
                export MKFS_OPTIONS="$F2FS_MKFS_OPTIONS"
                ;;
+       btrfs)
+               export MKFS_OPTIONS="$BTRFS_MKFS_OPTIONS"
+               ;;
+       bcachefs)
+               export MKFS_OPTIONS=$BCACHEFS_MKFS_OPTIONS
+               ;;
        *)
                ;;
        esac