From: Bart Van Assche <bvanassche@acm.org>
To: Omar Sandoval <osandov@fb.com>
Cc: linux-block@vger.kernel.org,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Daniel Wagner <dwagner@suse.de>,
Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH blktests v4 1/4] Make _exit_null_blk remove all null_blk device instances
Date: Sat, 28 Mar 2020 11:22:48 -0700 [thread overview]
Message-ID: <20200328182251.19945-2-bvanassche@acm.org> (raw)
In-Reply-To: <20200328182251.19945-1-bvanassche@acm.org>
Instead of making every test remove null_blk device instances before calling
_exit_null_blk(), move the null_blk device instance removal code into
_exit_null_blk().
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
common/null_blk | 7 ++++++-
tests/block/022 | 3 ---
tests/block/029 | 1 -
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/common/null_blk b/common/null_blk
index 2e300c20bbc7..a4140e365955 100644
--- a/common/null_blk
+++ b/common/null_blk
@@ -8,11 +8,15 @@ _have_null_blk() {
_have_modules null_blk
}
-_init_null_blk() {
+_remove_null_blk_devices() {
if [[ -d /sys/kernel/config/nullb ]]; then
find /sys/kernel/config/nullb -mindepth 1 -maxdepth 1 \
-type d -delete
fi
+}
+
+_init_null_blk() {
+ _remove_null_blk_devices
local zoned=""
if (( RUN_FOR_ZONED )); then zoned="zoned=1"; fi
@@ -26,6 +30,7 @@ _init_null_blk() {
}
_exit_null_blk() {
+ _remove_null_blk_devices
udevadm settle
modprobe -r null_blk
}
diff --git a/tests/block/022 b/tests/block/022
index 1404aacef295..b2c53e266d81 100755
--- a/tests/block/022
+++ b/tests/block/022
@@ -50,9 +50,6 @@ test() {
wait $pid1
} 2>/dev/null
- rmdir /sys/kernel/config/nullb/1
- rmdir /sys/kernel/config/nullb/0
-
_exit_null_blk
echo "Test complete"
}
diff --git a/tests/block/029 b/tests/block/029
index d298bac8db5c..0d521edb0cf6 100755
--- a/tests/block/029
+++ b/tests/block/029
@@ -58,7 +58,6 @@ test() {
else
echo "Skipping test because $sq cannot be modified" >>"$FULL"
fi
- rmdir /sys/kernel/config/nullb/nullb0
_exit_null_blk
echo Passed
}
next prev parent reply other threads:[~2020-03-28 18:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-28 18:22 [PATCH blktests v4 0/4] Test the blk_mq_realloc_hw_ctxs() error path Bart Van Assche
2020-03-28 18:22 ` Bart Van Assche [this message]
2020-03-28 18:22 ` [PATCH blktests v4 2/4] Use _{init,exit}_null_blk instead of open-coding these functions Bart Van Assche
2020-03-28 18:22 ` [PATCH blktests v4 3/4] Introduce the function _configure_null_blk() Bart Van Assche
2020-03-28 18:22 ` [PATCH blktests v4 4/4] Add a test that triggers the blk_mq_realloc_hw_ctxs() error path Bart Van Assche
2020-03-30 7:39 ` Daniel Wagner
2020-04-08 22:05 ` [PATCH blktests v4 0/4] Test " Omar Sandoval
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=20200328182251.19945-2-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=dwagner@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=osandov@fb.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.