From: "Darrick J. Wong" <djwong@kernel.org>
To: guaneryu@gmail.com, zlang@redhat.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me,
tytso@mit.edu, linux-ext4@vger.kernel.org
Subject: [PATCH v1.3 3/3] common/ext4: provide custom ext4 scratch fs options
Date: Thu, 4 Aug 2022 09:29:01 -0700 [thread overview]
Message-ID: <YuvzzdisuzXKVlJK@magnolia> (raw)
In-Reply-To: <165950051745.198922.6487109955066878945.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Create a _scratch_options backend for ext* so that we can inject
pathnames to external log devices into the scratch fs mount options.
This enables common/dm* to install block device filters, e.g. dm-error
for stress testing.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
v1.1: bad at counting
v1.2: refactor _scratch_mkfs_ext4 to use _scratch_options too
v1.3: quiet down realpath usage when SCRATCH_LOGDEV is unset
---
common/ext4 | 35 ++++++++++++++++++++++++++++++++---
common/rc | 3 +++
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/common/ext4 b/common/ext4
index 287705af..f2df888c 100644
--- a/common/ext4
+++ b/common/ext4
@@ -63,16 +63,24 @@ _setup_large_ext4_fs()
return 0
}
+_scratch_mkfs_ext4_opts()
+{
+ mkfs_opts=$*
+
+ _scratch_options mkfs
+
+ echo "$MKFS_EXT4_PROG $SCRATCH_OPTIONS $mkfs_opts"
+}
+
_scratch_mkfs_ext4()
{
- local mkfs_cmd="$MKFS_EXT4_PROG -F"
+ local mkfs_cmd="`_scratch_mkfs_ext4_opts`"
local mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \" | grep -v \"^$\""
local tmp=`mktemp -u`
local mkfs_status
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
- $mkfs_cmd -O journal_dev $MKFS_OPTIONS $SCRATCH_LOGDEV && \
- mkfs_cmd="$mkfs_cmd -J device=$SCRATCH_LOGDEV"
+ $MKFS_EXT4_PROG -F -O journal_dev $MKFS_OPTIONS $SCRATCH_LOGDEV
_scratch_do_mkfs "$mkfs_cmd" "$mkfs_filter" $* 2>$tmp.mkfserr 1>$tmp.mkfsstd
mkfs_status=$?
@@ -154,3 +162,24 @@ _require_scratch_richacl_ext4()
|| _notrun "kernel doesn't support richacl feature on $FSTYP"
_scratch_unmount
}
+
+_scratch_ext4_options()
+{
+ local type=$1
+ local log_opt=""
+
+ case $type in
+ mkfs)
+ SCRATCH_OPTIONS="$SCRATCH_OPTIONS -F"
+ log_opt="-J device=$SCRATCH_LOGDEV"
+ ;;
+ mount)
+ # As of kernel 5.19, the kernel mount option path parser only
+ # accepts direct paths to block devices--the final path
+ # component cannot be a symlink.
+ log_opt="-o journal_path=$(realpath -q "$SCRATCH_LOGDEV")"
+ ;;
+ esac
+ [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+ SCRATCH_OPTIONS="$SCRATCH_OPTIONS ${log_opt}"
+}
diff --git a/common/rc b/common/rc
index dc1d65c3..b82bb36b 100644
--- a/common/rc
+++ b/common/rc
@@ -178,6 +178,9 @@ _scratch_options()
"xfs")
_scratch_xfs_options "$@"
;;
+ ext2|ext3|ext4|ext4dev)
+ _scratch_ext4_options "$@"
+ ;;
esac
}
next prev parent reply other threads:[~2022-08-04 16:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 4:21 [PATCHSET 0/3] fstests: refactor ext4-specific code Darrick J. Wong
2022-08-03 4:21 ` [PATCH 1/3] common/rc: move ext4-specific helpers into a separate common/ext4 file Darrick J. Wong
2022-08-03 4:21 ` [PATCH 2/3] common/rc: move XFS-specific parts of _scratch_options into common/xfs Darrick J. Wong
2022-08-03 4:21 ` [PATCH 3/3] common/ext4: provide custom ext4 scratch fs options Darrick J. Wong
2022-08-03 18:28 ` Zorro Lang
2022-08-03 18:52 ` Darrick J. Wong
2022-08-04 0:25 ` [PATCH v1.2 " Darrick J. Wong
2022-08-04 5:03 ` Darrick J. Wong
2022-08-04 16:29 ` Darrick J. Wong [this message]
2022-08-05 17:08 ` [PATCH v1.3 " Zorro Lang
2022-08-06 14:36 ` [PATCHSET 0/3] fstests: refactor ext4-specific code Zorro Lang
2022-08-07 16:30 ` Darrick J. Wong
2022-08-08 15:13 ` 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=YuvzzdisuzXKVlJK@magnolia \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=zlang@redhat.com \
/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.