nvme: drop default trtype argument for _nvmet_passthru_target_connect

Every invocation of _nvmet_passthru_target_connect passes in the default
nvme_trtype argument. The argument is not evaluated anymore, thus just
remove it.

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 6cc4f57e6d601f816f8009e9ac07012086001714..cb120e20b573430e6d9754ea8525f44469a98d71 100755 (executable)
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -53,7 +53,7 @@ test_device() {
 
        _nvmet_passthru_target_setup "${def_subsysnqn}"
 
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${def_subsysnqn}")
 
        compare_dev_info "${nsdev}"
 

diff --git a/tests/nvme/034 b/tests/nvme/034
index 3bd1c3ad2f6144286a89125700cc20385e1895c0..98a7db859b3606f20d8e4ff3c051c6896727ad90 100755 (executable)
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -23,7 +23,7 @@ test_device() {
        local nsdev
 
        _nvmet_passthru_target_setup "${def_subsysnqn}"
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${def_subsysnqn}")
 
        _run_fio_verify_io --size="${nvme_img_size}" --filename="${nsdev}"
 

diff --git a/tests/nvme/035 b/tests/nvme/035
index 01aa09077d6a5f8d543edcc8b0ec61b921452fe8..c17e8be6ce46e18b7b3db4dfcf4bdc822acf414a 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -29,7 +29,7 @@ test_device() {
        local nsdev
 
        _nvmet_passthru_target_setup "${def_subsysnqn}"
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${def_subsysnqn}")
 
        if ! _xfs_run_fio_verify_io "${nsdev}" "${nvme_img_size}"; then
                echo "FAIL: fio verify failed"

diff --git a/tests/nvme/036 b/tests/nvme/036
index 89ccd256a67cb5b4ea1cfb159376154c80f3963c..a1ae74fa95ea9f0725d7e88c77a769e32f044ca2 100755 (executable)
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -21,7 +21,7 @@ test_device() {
        local ctrldev
 
        _nvmet_passthru_target_setup "${def_subsysnqn}"
-       nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${def_subsysnqn}")
+       nsdev=$(_nvmet_passthru_target_connect "${def_subsysnqn}")
 
        ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
 

diff --git a/tests/nvme/037 b/tests/nvme/037
index a2815b3ff2d7273dfd89383445c8c249e2fa56a0..eb47839a4289984792eb1c4d8284917b4430977e 100755 (executable)
--- a/tests/nvme/037
+++ b/tests/nvme/037
@@ -23,8 +23,7 @@ test_device() {
 
        for ((i = 0; i < iterations; i++)); do
                _nvmet_passthru_target_setup "${subsys}${i}"
-               nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" \
-                               "${subsys}${i}")
+               nsdev=$(_nvmet_passthru_target_connect "${subsys}${i}")
 
                _nvme_disconnect_subsys "${subsys}${i}" >>"${FULL}" 2>&1
                _nvmet_passthru_target_cleanup "${subsys}${i}"

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 9ce2fd787f8d63e7bb85f811f8e1e9473cacd70c..1dd1072f9ffb721c48e2853a083d89bf899aeef9 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -897,8 +897,7 @@ _nvmet_passthru_target_setup() {
 }
 
 _nvmet_passthru_target_connect() {
-       local trtype=$1
-       local subsys_name=$2
+       local subsys_name=$1
 
        _nvme_connect_subsys "${subsys_name}" --no-wait || return
        nsdev=$(_find_nvme_passthru_loop_dev "${subsys_name}")