block/023: 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/023 b/tests/block/023
index 0f20f4aaaf860030d2b8aa3731e27e83a377bd94..db1cbe04d5d8b948330a66e3a7663b57f0a6828a 100755 (executable)
--- a/tests/block/023
+++ b/tests/block/023
@@ -21,10 +21,11 @@ test() {
 
        local queue_mode
        for queue_mode in 0 2; do
-               if _init_null_blk gb=1 queue_mode="$queue_mode"; then
+               if _configure_null_blk nullb1 size=1024 \
+                               queue_mode="$queue_mode" power=1; then
                        echo "Queue mode $queue_mode"
-                       dd if=/dev/nullb0 of=/dev/null iflag=direct bs=64k status=none
-                       dd if=/dev/null of=/dev/nullb0 oflag=direct bs=64k status=none
+                       dd if=/dev/nullb1 of=/dev/null iflag=direct bs=64k status=none
+                       dd if=/dev/null of=/dev/nullb1 oflag=direct bs=64k status=none
                        _exit_null_blk
                fi
        done