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 6/9] misc: replace more open-coded _scratch_xfs_db calls
Date: Tue, 13 Apr 2021 18:05:07 -0700 [thread overview]
Message-ID: <161836230786.2754991.7641118311374470635.stgit@magnolia> (raw)
In-Reply-To: <161836227000.2754991.9697150788054520169.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Replace the last remaining open-coded calls to xfs_db for the scratch
device with calls to _scratch_xfs_db. This fixes these tests when
external logs are enabled.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/repair | 2 +-
tests/xfs/030 | 2 +-
tests/xfs/083 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/repair b/common/repair
index 8adc2178..5a957f4e 100644
--- a/common/repair
+++ b/common/repair
@@ -10,7 +10,7 @@ _zero_position()
struct="$2"
# set values for off/len variables provided by db
- eval `xfs_db -r -c "$struct" -c stack $SCRATCH_DEV | perl -ne '
+ eval `_scratch_xfs_db -r -c "$struct" -c stack | perl -ne '
if (/byte offset (\d+), length (\d+)/) {
print "offset=$1\nlength=$2\n"; exit
}'`
diff --git a/tests/xfs/030 b/tests/xfs/030
index 906d9019..81198155 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -81,7 +81,7 @@ else
_scratch_unmount
fi
clear=""
-eval `xfs_db -r -c "sb 1" -c stack $SCRATCH_DEV | perl -ne '
+eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
if (/byte offset (\d+), length (\d+)/) {
print "clear=", $1 / 512, "\n"; exit
}'`
diff --git a/tests/xfs/083 b/tests/xfs/083
index a548be2a..a3f32cb7 100755
--- a/tests/xfs/083
+++ b/tests/xfs/083
@@ -108,7 +108,7 @@ echo "+ check fs" >> $seqres.full
_scratch_xfs_repair >> $seqres.full 2>&1 || _fail "should pass initial fsck"
echo "++ corrupt image" >> $seqres.full
-xfs_db -x -c blockget -c "blocktrash ${FUZZ_ARGS}" "${SCRATCH_DEV}" >> $seqres.full 2>&1
+_scratch_xfs_db -x -c blockget -c "blocktrash ${FUZZ_ARGS}" >> $seqres.full 2>&1
echo "++ mount image" >> $seqres.full
_try_scratch_mount >> $seqres.full 2>&1
next prev parent reply other threads:[~2021-04-14 1:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 1:04 [PATCHSET 0/9] fstests: random fixes Darrick J. Wong
2021-04-14 1:04 ` [PATCH 1/9] xfs/506: fix regression on freshly quotachecked filesystem Darrick J. Wong
2021-04-14 6:12 ` Christoph Hellwig
2021-04-14 1:04 ` [PATCH 2/9] generic/563: selectively remove the io cgroup controller Darrick J. Wong
2021-04-14 6:13 ` Christoph Hellwig
2021-04-14 1:04 ` [PATCH 3/9] xfs/521,530: refactor scratch fs check Darrick J. Wong
2021-04-14 6:15 ` Christoph Hellwig
2021-04-14 1:04 ` [PATCH 4/9] common/dump: filter out xfs_restore messages about fallocate failures Darrick J. Wong
2021-04-14 6:16 ` Christoph Hellwig
2021-04-14 1:05 ` [PATCH 5/9] common/dmthin: make this work with external log devices Darrick J. Wong
2021-04-14 6:17 ` Christoph Hellwig
2021-04-18 12:25 ` Eryu Guan
2021-04-18 14:44 ` Theodore Ts'o
2021-04-19 2:04 ` Dave Chinner
2021-04-19 16:14 ` Darrick J. Wong
2021-04-14 1:05 ` Darrick J. Wong [this message]
2021-04-14 6:18 ` [PATCH 6/9] misc: replace more open-coded _scratch_xfs_db calls Christoph Hellwig
2021-04-14 1:05 ` [PATCH 7/9] generic/620: fix order of require_scratch calls Darrick J. Wong
2021-04-14 6:20 ` Christoph Hellwig
2021-04-14 1:05 ` [PATCH 8/9] generic/{094,225}: skip test when the xfs rt extent size is larger than 1 fsb Darrick J. Wong
2021-04-14 6:20 ` Christoph Hellwig
2021-04-14 1:05 ` [PATCH 9/9] xfs/305: make sure that fsstress is still running when we quotaoff Darrick J. Wong
2021-04-14 6:21 ` Christoph Hellwig
2021-04-14 14:38 ` Darrick J. Wong
2021-04-20 6:21 ` Christoph Hellwig
2021-04-18 12:29 ` [PATCHSET 0/9] fstests: random fixes Eryu Guan
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=161836230786.2754991.7641118311374470635.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).