block/004, zbd/{005,006}: call _test_dev_set_scheduler

The test cases block/004, zbd/005 and zbd/006 do write to zoned block
devices which require mq-deadline scheduler. When TEST_DEV is a bio
based device-mapper, mq-deadline scheduler shall be set to destination
devices. For this purpose, call _test_dev_set_scheduler instead of
_test_dev_queue_set.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/block/004 b/tests/block/004
index a7cec95d84c4be87713dc8ae014d8e12c2335d4d..63484a458e071622042e20bd319d5cc4aed4cda5 100755 (executable)
--- a/tests/block/004
+++ b/tests/block/004
@@ -24,7 +24,7 @@ test_device() {
        local -a opts=()
 
        if _test_dev_is_zoned; then
-               _test_dev_queue_set scheduler deadline
+               _test_dev_set_scheduler deadline
                opts+=("--direct=1" "--zonemode=zbd")
                opts+=("--max_open_zones=$(_test_dev_max_open_active_zones)")
        fi

diff --git a/tests/zbd/005 b/tests/zbd/005
index a7fb17503b731898e08042a981e0a13bb24abde0..4aa1ab5678e06c0a2912c0460ba177cea9ad3bbd 100755 (executable)
--- a/tests/zbd/005
+++ b/tests/zbd/005
@@ -48,7 +48,7 @@ test_device() {
 
        blkzone reset -o "${ZONE_STARTS[zone_idx]}" "${TEST_DEV}"
 
-       _test_dev_queue_set scheduler deadline
+       _test_dev_set_scheduler deadline
 
        : "${TIMEOUT:=30}"
        FIO_PERF_FIELDS=("write io" "write iops")

diff --git a/tests/zbd/006 b/tests/zbd/006
index b745acdc12dcadd14f6b4c9d1792f94b378e1160..2db0e9bbb411e84fa12a63487252d60d856a3447 100755 (executable)
--- a/tests/zbd/006
+++ b/tests/zbd/006
@@ -38,7 +38,7 @@ test_device() {
 
        blkzone reset -o "${ZONE_STARTS[zone_idx]}" "${TEST_DEV}"
 
-       _test_dev_queue_set scheduler deadline
+       _test_dev_set_scheduler deadline
 
        : "${TIMEOUT:=30}"
        FIO_PERF_FIELDS=("write io" "write iops")