@@ -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
}
@@ -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"
}
@@ -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
}