From: Darrick J. Wong Date: Tue, 9 Jul 2019 17:49:53 +0000 (-0700) Subject: xfs/119: fix MKFS_OPTIONS exporting X-Git-Tag: v2022.05.01~1094 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=968c531cbe58290f7863fb6d3b6814db2c807a7b;ds=sidebyside xfs/119: fix MKFS_OPTIONS exporting This test originally exported its own MKFS_OPTIONS to force the tested filesystem config to the mkfs defaults + test-specific log size options. This overrides whatever the test runner might have set in MKFS_OPTIONS. In commit 2fd273886b525 ("xfs: refactor minimum log size formatting code") we fail to export our test-specific MKFS_OPTIONS before calculating the minimum log size, which leads to the wrong min log size being calculated once we fixed the helper to be smarter about mkfs options. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Collins Signed-off-by: Eryu Guan --- diff --git a/tests/xfs/119 b/tests/xfs/119 index 8825a5c3..f245a0a6 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -38,7 +38,8 @@ _require_scratch # this may hang sync -logblks=$(_scratch_find_xfs_min_logblocks -l version=2,su=64k) +export MKFS_OPTIONS="-l version=2,su=64k" +logblks=$(_scratch_find_xfs_min_logblocks) export MKFS_OPTIONS="-l version=2,size=${logblks}b,su=64k" export MOUNT_OPTIONS="-o logbsize=64k" _scratch_mkfs_xfs >/dev/null