Make _exit_null_blk remove all null_blk device instances

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>

diff --git a/common/null_blk b/common/null_blk
index 2e300c20bbc776e2aa1daf9b325c36f2dbc892ac..a4140e365955cc1f9a3ebc7511e3ee1e6a6a6497 100644 (file)
--- 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 1404aacef295fee85255d3f4aa39da6d45e3f5c8..b2c53e266d81abd3552c6565787626f1c5e5500c 100755 (executable)
--- 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 d298bac8db5c8eeb08ac041a42578ef44f41d139..0d521edb0cf6c42ed70d7694080fe7552ceaf7cc 100755 (executable)
--- 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
 }