From: Su Yue <glass.su@suse.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, Su Yue <glass.su@suse.com>,
Filipe Manana <fdmanana@suse.com>, Qu Wenruo <wqu@suse.com>
Subject: [PATCH v3] btrfs/172,206: call _log_writes_cleanup in _cleanup
Date: Thu, 7 Mar 2024 12:04:08 +0800 [thread overview]
Message-ID: <20240307040408.15410-1-l@damenly.org> (raw)
From: Su Yue <glass.su@suse.com>
Because block group tree requires require no-holes feature,
_log_writes_mkfs "-O ^no-holes" fails when "-O block-group-tree" is
given in MKFS_OPTION.
Without explicit _log_writes_cleanup, the two tests fail with
logwrites-test device left. And all next tests will fail due to
SCRATCH DEVICE EBUSY.
Fix it by overriding _cleanup to call _log_writes_cleanup.
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Su Yue <glass.su@suse.com>
---
changelog:
v3:
Adjust custom _cleanup().
v2:
Remove unneeded comments for _cleanup.
Add rvbs.
---
tests/btrfs/172 | 7 +++++++
tests/btrfs/206 | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/tests/btrfs/172 b/tests/btrfs/172
index f5acc6982cd7..f2997c047eff 100755
--- a/tests/btrfs/172
+++ b/tests/btrfs/172
@@ -13,6 +13,13 @@
. ./common/preamble
_begin_fstest auto quick log replay recoveryloop
+_cleanup()
+{
+ cd /
+ _log_writes_cleanup &> /dev/null
+ rm -f $tmp.*
+}
+
# Import common functions.
. ./common/filter
. ./common/dmlogwrites
diff --git a/tests/btrfs/206 b/tests/btrfs/206
index f6571649076f..6ac3d27bbde3 100755
--- a/tests/btrfs/206
+++ b/tests/btrfs/206
@@ -14,6 +14,13 @@
. ./common/preamble
_begin_fstest auto quick log replay recoveryloop punch prealloc
+_cleanup()
+{
+ cd /
+ _log_writes_cleanup &> /dev/null
+ rm -f $tmp.*
+}
+
# Import common functions.
. ./common/filter
. ./common/dmlogwrites
--
2.44.0
reply other threads:[~2024-03-07 4:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240307040408.15410-1-l@damenly.org \
--to=glass.su@suse.com \
--cc=20240216102550.46210-1-l@damenly.org \
--cc=fdmanana@suse.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.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 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 read-only IMAP folder(s) and NNTP newsgroup(s).