From 2aaaef91f30560688407f92dbd6688a90b99fd20 Mon Sep 17 00:00:00 2001 From: Xiao Yang Date: Thu, 6 Aug 2020 10:13:37 +0800 Subject: [PATCH] generic/223: Don't clear MKFS_OPTION before calling _scratch_mkfs_geom() Current _scratch_mkfs_geom() adds geometry parameters to the end of the MKFS_OPTIONS blindly. ext4 can accept the last one if geometry parameters and original MKFS_OPTION have the same mkfs options but xfs cannot accept them and reports "xxx option is respecified" error. Make _scratch_mkfs_geom() override the same mkfs options in original MKFS_OPTION by geometry parameters. With this change, generic/223 doesn't need to clear original MKFS_OPTION before calling _scratch_mkfs_geom() and can use other mkfs options in original MKFS_OPTION. Signed-off-by: Xiao Yang Reviewed-by: Darrick J. Wong Signed-off-by: Eryu Guan --- common/rc | 14 +++++++++++++- tests/generic/223 | 1 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index 359d03ad..ad4d080d 100644 --- a/common/rc +++ b/common/rc @@ -1051,7 +1051,19 @@ _scratch_mkfs_geom() case $FSTYP in xfs) - MKFS_OPTIONS+=" -b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult" + if echo "$MKFS_OPTIONS" | egrep -q "b?size="; then + MKFS_OPTIONS=$(echo "$MKFS_OPTIONS" | sed -r "s/(b?size=)[0-9]+/\1$blocksize/") + else + MKFS_OPTIONS+=" -b size=$blocksize" + fi + + if echo "$MKFS_OPTIONS" | egrep -q "(su|sunit|sw|swidth)="; then + MKFS_OPTIONS=$(echo "$MKFS_OPTIONS" | sed -r \ + -e "s/(su|sunit)=[0-9kmg]+/su=$sunit_bytes/" \ + -e "s/(sw|swidth)=[0-9kmg]+/sw=$swidth_mult/") + else + MKFS_OPTIONS+=" -d su=$sunit_bytes,sw=$swidth_mult" + fi ;; ext4|ext4dev) MKFS_OPTIONS+=" -b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks" diff --git a/tests/generic/223 b/tests/generic/223 index 6cfd00dd..ba7c9a44 100755 --- a/tests/generic/223 +++ b/tests/generic/223 @@ -41,7 +41,6 @@ for SUNIT_K in 8 16 32 64 128; do let SUNIT_BLOCKS=$SUNIT_BYTES/$BLOCKSIZE echo "=== mkfs with su $SUNIT_BLOCKS blocks x 4 ===" - export MKFS_OPTIONS="" _scratch_mkfs_geom $SUNIT_BYTES 4 $BLOCKSIZE >> $seqres.full 2>&1 _scratch_mount -- 2.30.2