From b13284d992aad356705f7616bd8e2d1e27a75294 Mon Sep 17 00:00:00 2001 From: Chandan Babu R Date: Tue, 9 Feb 2021 21:42:52 +0530 Subject: [PATCH] _scratch_mkfs_geom(): Filter out 'k' suffix from fs block size If the original value of $MKFS_OPTIONS contained a block size value having 'k' as a suffix (e.g. -b size=4k), then the newly constructed value of $MKFS_OPTIONS will have 'k' suffixed to the value of $blocksize. $blocksize itself is specified in units of bytes. Hence having 'k' suffixed to this value will result in an incorrect block size. This commit fixes the bug by conditionally filtering out the 'k' suffix from block size option present in the original value of $MKFS_OPTIONS. Signed-off-by: Chandan Babu R Reviewed-by: Darrick J. Wong Signed-off-by: Eryu Guan --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 649b1cfd..0ec7fe1a 100644 --- a/common/rc +++ b/common/rc @@ -1062,7 +1062,7 @@ _scratch_mkfs_geom() case $FSTYP in xfs) if echo "$MKFS_OPTIONS" | egrep -q "b?size="; then - MKFS_OPTIONS=$(echo "$MKFS_OPTIONS" | sed -r "s/(b?size=)[0-9]+/\1$blocksize/") + MKFS_OPTIONS=$(echo "$MKFS_OPTIONS" | sed -r "s/(b?size=)[0-9]+k?/\1$blocksize/") else MKFS_OPTIONS+=" -b size=$blocksize" fi -- 2.25.1