nvme/{033,034,035,036}: use default subsysnqn variable directly

There is no need to introduce an extra local variable when it
uses the default subsysnqn anyway.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/033 b/tests/nvme/033
index 46a520ae01fabbf35ebe91599df97c1e6ede2e1c..d924883460c26157074d8900e50a3fbe76a51541 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -49,18 +49,17 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="${def_subsysnqn}"
        local nsdev
        local port
 
-       port=$(_nvmet_passthru_target_setup "${subsys}")
+       port=$(_nvmet_passthru_target_setup "${def_subsysnqn}")
 
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
+       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
 
        compare_dev_info "${nsdev}"
 
-       _nvme_disconnect_subsys "${subsys}"
-       _nvmet_passthru_target_cleanup "${port}" "${subsys}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvmet_passthru_target_cleanup "${port}" "${def_subsysnqn}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/034 b/tests/nvme/034
index 3c65d92cbaeaf63fcffcc8ed2c0c4b9c5ebe040b..e79eef5e756dad9221e5d35caec40f598e6f1daf 100755 (executable)
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -19,18 +19,17 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="${def_subsysnqn}"
        local ctrldev
        local nsdev
        local port
 
-       port=$(_nvmet_passthru_target_setup "${subsys}")
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
+       port=$(_nvmet_passthru_target_setup "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
 
        _run_fio_verify_io --size="${nvme_img_size}" --filename="${nsdev}"
 
-       _nvme_disconnect_subsys "${subsys}"
-       _nvmet_passthru_target_cleanup "${port}" "${subsys}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvmet_passthru_target_cleanup "${port}" "${def_subsysnqn}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/035 b/tests/nvme/035
index c705d9cf25a4e609c5a3546551773666832b993e..f0dfc92ceeea0910227989455b42d9767427e2d1 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -25,18 +25,17 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="${def_subsysnqn}"
        local ctrldev
        local nsdev
        local port
 
-       port=$(_nvmet_passthru_target_setup "${subsys}")
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
+       port=$(_nvmet_passthru_target_setup "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
 
        _xfs_run_fio_verify_io "${nsdev}" "${nvme_img_size}"
 
-       _nvme_disconnect_subsys "${subsys}"
-       _nvmet_passthru_target_cleanup "${port}" "${subsys}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvmet_passthru_target_cleanup "${port}" "${def_subsysnqn}"
 
        echo "Test complete"
 }

diff --git a/tests/nvme/036 b/tests/nvme/036
index 2e933cc41928f78281f67bd188659f988e7b1521..61b9e2309da73258e2bb2c5aeb3f5cc50d7b5b05 100755 (executable)
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -18,21 +18,20 @@ test_device() {
 
        _setup_nvmet
 
-       local subsys="${def_subsysnqn}"
        local ctrldev
        local port
 
-       port=$(_nvmet_passthru_target_setup "${subsys}")
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
+       port=$(_nvmet_passthru_target_setup "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
 
-       ctrldev=$(_find_nvme_dev "${subsys}")
+       ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
 
        if ! nvme reset "/dev/${ctrldev}" >> "$FULL" 2>&1; then
                echo "ERROR: reset failed"
        fi
 
-       _nvme_disconnect_subsys "${subsys}"
-       _nvmet_passthru_target_cleanup "${port}" "${subsys}"
+       _nvme_disconnect_subsys "${def_subsysnqn}"
+       _nvmet_passthru_target_cleanup "${port}" "${def_subsysnqn}"
 
        echo "Test complete"
 }