From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH 2/2] common/dmthin: make this work with external log devices
Date: Tue, 20 Apr 2021 17:22:31 -0700 [thread overview]
Message-ID: <161896455168.776190.4208955976933964610.stgit@magnolia> (raw)
In-Reply-To: <161896453944.776190.2831340458112794975.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Provide a mkfs helper to format the dm thin device when external devices
are in use, and fix the dmthin mount helper to support them. This fixes
regressions in generic/347 and generic/500 when external logs are in
use.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/dmthin | 9 ++++++++-
tests/generic/347 | 2 +-
tests/generic/500 | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/common/dmthin b/common/dmthin
index c58c3948..3b1c7d45 100644
--- a/common/dmthin
+++ b/common/dmthin
@@ -218,10 +218,17 @@ _dmthin_set_fail()
_dmthin_mount_options()
{
- echo `_common_dev_mount_options $*` $DMTHIN_VOL_DEV $SCRATCH_MNT
+ _scratch_options mount
+ echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS $DMTHIN_VOL_DEV $SCRATCH_MNT
}
_dmthin_mount()
{
_mount -t $FSTYP `_dmthin_mount_options $*`
}
+
+_dmthin_mkfs()
+{
+ _scratch_options mkfs
+ _mkfs_dev $SCRATCH_OPTIONS $@ $DMTHIN_VOL_DEV
+}
diff --git a/tests/generic/347 b/tests/generic/347
index cbc5150a..e970ac10 100755
--- a/tests/generic/347
+++ b/tests/generic/347
@@ -31,7 +31,7 @@ _setup_thin()
{
_dmthin_init $BACKING_SIZE $VIRTUAL_SIZE
_dmthin_set_queue
- _mkfs_dev $DMTHIN_VOL_DEV
+ _dmthin_mkfs
_dmthin_mount
}
diff --git a/tests/generic/500 b/tests/generic/500
index 085ddbf3..5ab2f78c 100755
--- a/tests/generic/500
+++ b/tests/generic/500
@@ -68,7 +68,7 @@ CLUSTER_SIZE=$((64 * 1024 / 512)) # 64K
_dmthin_init $BACKING_SIZE $VIRTUAL_SIZE $CLUSTER_SIZE 0
_dmthin_set_fail
-_mkfs_dev $DMTHIN_VOL_DEV
+_dmthin_mkfs
_dmthin_mount
# There're two bugs at here, one is dm-thin bug, the other is filesystem
next prev parent reply other threads:[~2021-04-21 0:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 0:22 [PATCHSET 0/2] fstests: random fixes Darrick J. Wong
2021-04-21 0:22 ` [PATCH 1/2] generic/223: make sure all files get created on the data device Darrick J. Wong
2021-04-21 17:26 ` Brian Foster
2021-04-22 0:29 ` Allison Henderson
2021-04-21 0:22 ` Darrick J. Wong [this message]
2021-04-21 17:26 ` [PATCH 2/2] common/dmthin: make this work with external log devices Brian Foster
2021-04-22 0:29 ` Allison Henderson
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=161896455168.776190.4208955976933964610.stgit@magnolia \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).