block/021: convert to use _configure_null_blk

Switch to use _configure_null_blk so that built-in null_blk can be
supported, which implies not using the default nullb0 device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/block/021 b/tests/block/021
index a1bbf45a3bc955433d15b4468f9d2403d49b44b0..89ebcd068dc8a02f185d4c82089571f5bdef8f86 100755 (executable)
--- a/tests/block/021
+++ b/tests/block/021
@@ -20,7 +20,7 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk; then
+       if ! _configure_null_blk nullb1 power=1; then
                return 1
        fi
 
@@ -28,14 +28,14 @@ test() {
        local nr
        local scheds
        # shellcheck disable=SC2207
-       scheds=($(sed 's/[][]//g' /sys/block/nullb0/queue/scheduler))
+       scheds=($(sed 's/[][]//g' /sys/block/nullb1/queue/scheduler))
 
        for sched in "${scheds[@]}"; do
                echo "Testing $sched" >> "$FULL"
-               echo "$sched" > /sys/block/nullb0/queue/scheduler
-               max_nr="$(cat /sys/block/nullb0/queue/nr_requests)"
+               echo "$sched" > /sys/block/nullb1/queue/scheduler
+               max_nr="$(cat /sys/block/nullb1/queue/nr_requests)"
                for ((nr = 4; nr <= max_nr; nr++)); do
-                       echo "$nr" > /sys/block/nullb0/queue/nr_requests
+                       echo "$nr" > /sys/block/nullb1/queue/nr_requests
                done
        done