From: Zorro Lang Date: Tue, 25 May 2021 04:46:41 +0000 (+0800) Subject: common/config: remove default 4k blocksize from XFS_MKFS_OPTIONS X-Git-Tag: v2022.05.01~377 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=dd562778ca935ea567c670c763860b7b8e43c8b5 common/config: remove default 4k blocksize from XFS_MKFS_OPTIONS xfstests set "-bsize=4k" to XFS_MKFS_OPTIONS by default, then give it to MKFS_OPTIOPNS. So MKFS_OPTIOPNS always contains "-bsize=4k" except we set XFS_MKFS_OPTIONS manually. It's useless to set XFS_MKFS_OPTIONS to "-bsize=4096" by default, especially that will cause all cases with _scratch_mkfs_blocksized() always fail as "-b size option respecified", when test on XFS. For exmaple: generic/222 Signed-off-by: Zorro Lang Acked-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/config b/common/config index ad1c9eb0..adc16b59 100644 --- 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"}