common/null_blk: remove explicit queue_mode=2 parameters

queue_mode 2 (aka blk-mq) is the default in null_blk, so remove the
extra explicitly parameter.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

diff --git a/tests/block/006 b/tests/block/006
index 0b8a3c01da21184f10e519f0a5e0294e86b19cd3..7ca102129e32a7d409f966a598ce5c024c4af6fc 100755 (executable)
--- a/tests/block/006
+++ b/tests/block/006
@@ -24,7 +24,7 @@ test() {
        _divide_timeout 2
        FIO_PERF_FIELDS=("read iops")
 
-       if ! _init_null_blk queue_mode=2 submit_queues=2 blocking=1; then
+       if ! _init_null_blk submit_queues=2 blocking=1; then
                return 1
        fi
 

diff --git a/tests/block/010 b/tests/block/010
index b81208e73939bc0b386cbbe61e9174cbf4c26f84..ed5613525255111bee228288d022320e821c460e 100644 (file)
--- a/tests/block/010
+++ b/tests/block/010
@@ -49,7 +49,7 @@ test() {
 
        _divide_timeout 2
 
-       if ! _init_null_blk queue_mode=2 submit_queues=16 nr_devices=32; then
+       if ! _init_null_blk submit_queues=16 nr_devices=32; then
                return 1
        fi
 
@@ -58,7 +58,7 @@ test() {
        run_fio_job
 
        _exit_null_blk
-       if ! _init_null_blk queue_mode=2 submit_queues=16 nr_devices=32 shared_tags=1; then
+       if ! _init_null_blk submit_queues=16 nr_devices=32 shared_tags=1; then
                return 1
        fi
 

diff --git a/tests/block/014 b/tests/block/014
index 04c34fa12b5ce0777e8b9e0c551e926e6b608c56..449046a20f8c75ec0bd664e53b6b4308b14362f7 100755 (executable)
--- a/tests/block/014
+++ b/tests/block/014
@@ -18,7 +18,7 @@ test() {
 
        # The format is "<interval>,<probability>,<space>,<times>". Here, we
        # fail 50% of I/Os.
-       if ! _init_null_blk queue_mode=2 timeout='1,50,0,-1'; then
+       if ! _init_null_blk timeout='1,50,0,-1'; then
                return 1
        fi
 

diff --git a/tests/block/015 b/tests/block/015
index 79102a2bea54b6fc095ca388bdf8449ea203adfc..2e5cf358a6b761a8fe67037959ea70954e52a8a6 100755 (executable)
--- a/tests/block/015
+++ b/tests/block/015
@@ -20,7 +20,7 @@ test() {
 
        # The format is "<interval>,<probability>,<space>,<times>". Here, we
        # requeue 10% of the time.
-       if ! _init_null_blk queue_mode=2 requeue='1,10,0,-1'; then
+       if ! _init_null_blk requeue='1,10,0,-1'; then
                return 1
        fi
 

diff --git a/tests/block/016 b/tests/block/016
index c70b7d04f60352febcf8f4a00a47d177edee0ec8..2b7a05f47cd929df82f02f3ef14f04e7a52bbb14 100755 (executable)
--- a/tests/block/016
+++ b/tests/block/016
@@ -20,7 +20,7 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk queue_mode=2 irqmode=2 completion_nsec=2000000000; then
+       if ! _init_null_blk irqmode=2 completion_nsec=2000000000; then
                return 1
        fi
 

diff --git a/tests/block/017 b/tests/block/017
index e4a9259d26d6de98e1e01d9c977d4f765a1edb91..c84b661c14e6d603334614cb9a2944e473491331 100755 (executable)
--- a/tests/block/017
+++ b/tests/block/017
@@ -27,8 +27,7 @@ show_inflight() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk queue_mode=2 irqmode=2 \
-            completion_nsec=500000000; then
+       if ! _init_null_blk irqmode=2 completion_nsec=500000000; then
                return 1
        fi
 

diff --git a/tests/block/018 b/tests/block/018
index 731272399a82b9b7d5e6d7a32e968cbfb62cd0f1..a80ecbcba440bcad7b5d37ec2799e88ef6427939 100755 (executable)
--- a/tests/block/018
+++ b/tests/block/018
@@ -33,8 +33,7 @@ test() {
 
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk queue_mode=2 irqmode=2 \
-            completion_nsec=1000000000; then
+       if ! _init_null_blk irqmode=2 completion_nsec=1000000000; then
                return 1
        fi
 

diff --git a/tests/block/020 b/tests/block/020
index b4887a26ff0a7b84820f1c64444c30577a11f0e0..eef63cb29ec8a81e6e620e1e95e7927243fad307 100755 (executable)
--- a/tests/block/020
+++ b/tests/block/020
@@ -20,7 +20,7 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       if ! _init_null_blk queue_mode=2 irqmode=2 completion_nsec=2000000 \
+       if ! _init_null_blk irqmode=2 completion_nsec=2000000 \
             submit_queues=4 hw_queue_depth=1; then
                return 1
        fi

diff --git a/tests/block/022 b/tests/block/022
index 30b2a6814fb85acb4b08d31086d2c70651c7b467..10851ff06ac1a48b8b3279325f0bccce8c1ec020 100755 (executable)
--- a/tests/block/022
+++ b/tests/block/022
@@ -28,7 +28,7 @@ test() {
        echo "Running ${TEST_NAME}"
        : "${TIMEOUT:=30}"
 
-       if ! _init_null_blk shared_tags=1 nr_devices=0 queue_mode=2; then
+       if ! _init_null_blk shared_tags=1 nr_devices=0; then
                return 1
        fi
 

diff --git a/tests/block/024 b/tests/block/024
index b40a869ee2d9d172897530d7a34d3af136e3a268..6808db0ab989b5f88b623107f6abdb1130eba58c 100755 (executable)
--- a/tests/block/024
+++ b/tests/block/024
@@ -37,8 +37,7 @@ test() {
 
        # The maximum value for CONFIG_HZ is 1000. I.e., a tick is one
        # millisecond. So, make each I/O take half a millisecond.
-       if ! _init_null_blk queue_mode=2 irqmode=2 \
-            completion_nsec=500000; then
+       if ! _init_null_blk irqmode=2 completion_nsec=500000; then
                return 1
        fi
 

diff --git a/tests/block/029 b/tests/block/029
index 0c4fe08869ee7c5c0e02a081c60dcafc1fa972e8..dcf402472ef2e86b88c0daaa1d13c62b4a66c4b2 100755 (executable)
--- a/tests/block/029
+++ b/tests/block/029
@@ -31,7 +31,7 @@ test() {
        local sq=/sys/kernel/config/nullb/nullb0/submit_queues
 
        : "${TIMEOUT:=30}"
-       _init_null_blk nr_devices=0 queue_mode=2 &&
+       _init_null_blk nr_devices=0 &&
        _configure_null_blk nullb0 completion_nsec=0 blocksize=512 \
                            size=16 memory_backed=1 power=1 &&
        if { echo 1 >$sq; } 2>/dev/null; then

diff --git a/tests/block/030 b/tests/block/030
index d2e528697873ca619a0e4aa0d388d89d51d0032c..f08f7720bc465088812c94ef1556739ff9f7bbeb 100755 (executable)
--- a/tests/block/030
+++ b/tests/block/030
@@ -22,7 +22,7 @@ test() {
        : "${TIMEOUT:=30}"
        # Legend: init_hctx=<interval>,<probability>,<space>,<times>
        # Set <space> to $(nproc) + 1 to make loading of null_blk succeed.
-       if ! _init_null_blk nr_devices=0 queue_mode=2 \
+       if ! _init_null_blk nr_devices=0 \
             "init_hctx=$(nproc),100,$(($(nproc) + 1)),-1"; then
                echo "Loading null_blk failed"
                return 1

diff --git a/tests/block/031 b/tests/block/031
index cb4ba6711ee57c69a276cc1b1072201b7b33b2dc..d253af88499d438037d9e5b33ecff501c80f6bc5 100755 (executable)
--- a/tests/block/031
+++ b/tests/block/031
@@ -18,7 +18,7 @@ test() {
        local fio_status bs=512
 
        : "${TIMEOUT:=30}"
-       if ! _init_null_blk nr_devices=0 queue_mode=2 shared_tag_bitmap=1; then
+       if ! _init_null_blk nr_devices=0 shared_tag_bitmap=1; then
                echo "Loading null_blk failed"
                return 1
        fi