block/018: 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>

diff --git a/tests/block/018 b/tests/block/018
index a80ecbcba440bcad7b5d37ec2799e88ef6427939..e7ac44521caeafd4f08f7045703521637f169d38 100755 (executable)
--- a/tests/block/018
+++ b/tests/block/018
@@ -15,13 +15,13 @@ requires() {
 }
 
 init_times() {
-       init_read_ms="$(awk '{ print $4 }' /sys/block/nullb0/stat)"
-       init_write_ms="$(awk '{ print $8 }' /sys/block/nullb0/stat)"
+       init_read_ms="$(awk '{ print $4 }' /sys/block/nullb1/stat)"
+       init_write_ms="$(awk '{ print $8 }' /sys/block/nullb1/stat)"
 }
 
 show_times() {
-       read_ms="$(awk '{ print $4 }' /sys/block/nullb0/stat)"
-       write_ms="$(awk '{ print $8 }' /sys/block/nullb0/stat)"
+       read_ms="$(awk '{ print $4 }' /sys/block/nullb1/stat)"
+       write_ms="$(awk '{ print $8 }' /sys/block/nullb1/stat)"
 
        # Print rounded to the nearest second
        printf 'read %d s\n' $(((read_ms - init_read_ms + 500) / 1000))
@@ -33,22 +33,23 @@ test() {
 
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk irqmode=2 completion_nsec=1000000000; then
+       if ! _configure_null_blk nullb1 irqmode=2 completion_nsec=1000000000 \
+                       power=1; then
                return 1
        fi
 
        init_times
        show_times
 
-       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none
+       dd if=/dev/nullb1 of=/dev/null bs=4096 iflag=direct count=1 status=none
        show_times
 
-       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none
+       dd if=/dev/zero of=/dev/nullb1 bs=4096 oflag=direct count=1 status=none
        show_times
 
-       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none &
-       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
-       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
+       dd if=/dev/nullb1 of=/dev/null bs=4096 iflag=direct count=1 status=none &
+       dd if=/dev/zero of=/dev/nullb1 bs=4096 oflag=direct count=1 status=none &
+       dd if=/dev/zero of=/dev/nullb1 bs=4096 oflag=direct count=1 status=none &
        wait
        show_times