block/006: 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/006 b/tests/block/006
index 7ca102129e32a7d409f966a598ce5c024c4af6fc..7d05b1113fb9954e19ef44ba40e3b2712da8672d 100755 (executable)
--- a/tests/block/006
+++ b/tests/block/006
@@ -24,18 +24,18 @@ test() {
        _divide_timeout 2
        FIO_PERF_FIELDS=("read iops")
 
-       if ! _init_null_blk submit_queues=2 blocking=1; then
+       if ! _configure_null_blk nullb1 submit_queues=2 blocking=1 power=1; then
                return 1
        fi
 
        # run sync test
        _fio_perf --bs=4k --ioengine=sync --rw=randread --norandommap --name=sync \
-               --filename=/dev/nullb0 --size=5g --direct=1
+               --filename=/dev/nullb1 --size=5g --direct=1
 
        # run async test
        _fio_perf --bs=4k --ioengine=libaio --iodepth=8 --numjobs="$(nproc)" \
                --rw=randread --norandommap --name=async \
-               --filename=/dev/nullb0 --size=5g --direct=1
+               --filename=/dev/nullb1 --size=5g --direct=1
 
        _exit_null_blk