From: Su Yue <glass.su@suse.com>
To: fstests@vger.kernel.org
Cc: linux-bcachefs@vger.kernel.org, l@damenly.org,
bfoster@redhat.com, Su Yue <glass.su@suse.com>
Subject: [PATCH v4 2/2] common/rc: improve block_size support for bcachefs
Date: Tue, 30 Jan 2024 07:51:04 +0800 [thread overview]
Message-ID: <20240129235104.8976-2-l@damenly.org> (raw)
In-Reply-To: <20240129235104.8976-1-l@damenly.org>
From: Su Yue <glass.su@suse.com>
mkfs.bcachefs now supports option '--block_size' to allow
custom block_size.
Add the pattern to set def_blksz if MKFS_OPTIONS contains the
option in _scratch_mkfs_sized.
Also let mkfs.bcachefs decide blocksize if no option is given in
MKFS_OPTIONS or _scratch_mkfs_sized parameter.
Signed-off-by: Su Yue <glass.su@suse.com>
---
changelog:
v4:
Respect block_size in MKFS_OPTIONS.
v3:
Add logic to Let mkfs.bcachefs decide blocksize if no option is given in
local.config or _scratch_mkfs_sized parameter.
v2:
Born.
---
common/rc | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index 31c21d2a8360..315a2413f963 100644
--- a/common/rc
+++ b/common/rc
@@ -930,6 +930,7 @@ _scratch_mkfs_sized()
local fssize=$1
local blocksize=$2
local def_blksz
+ local blocksize_opt
case $FSTYP in
xfs)
@@ -950,6 +951,13 @@ _scratch_mkfs_sized()
jfs)
def_blksz=4096
;;
+ bcachefs)
+ def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*(--block_size)[ =]?+([0-9]+).*/\2/p'`
+ [ -n "$blocksize" ] && blocksize_opt="--block_size=$blocksize"
+ [ -n "$def_blksize" ] && blocksize_opt="--block_size=$def_blksize"
+ # If no block size is given by local.confg or parameter, blocksize_opt is empty.
+ # Let MKFS_BCACHEFS_PROG decide block size on its own.
+ ;;
esac
[ -n "$def_blksz" ] && blocksize=$def_blksz
@@ -1051,7 +1059,7 @@ _scratch_mkfs_sized()
export MOUNT_OPTIONS="-o size=$fssize $TMPFS_MOUNT_OPTIONS"
;;
bcachefs)
- $MKFS_BCACHEFS_PROG $MKFS_OPTIONS --fs_size=$fssize --block_size=$blocksize $SCRATCH_DEV
+ $MKFS_BCACHEFS_PROG $MKFS_OPTIONS --fs_size=$fssize $blocksize_opt $SCRATCH_DEV
;;
*)
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
--
2.43.0
next prev parent reply other threads:[~2024-01-29 23:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 23:51 [PATCH v4 1/2] fstests: introduce MKFS_BCACHEFS_PROG for bcachefs Su Yue
2024-01-29 23:51 ` Su Yue [this message]
2024-01-30 14:17 ` [PATCH v4 2/2] common/rc: improve block_size support " Brian Foster
2024-01-31 14:11 ` Zorro Lang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240129235104.8976-2-l@damenly.org \
--to=glass.su@suse.com \
--cc=bfoster@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=l@damenly.org \
--cc=linux-bcachefs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.