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@xxxxxxx>
---
tests/nvme/033 | 2 +-
tests/nvme/034 | 2 +-
tests/nvme/035 | 2 +-
tests/nvme/036 | 2 +-
tests/nvme/037 | 3 +--
tests/nvme/rc | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/nvme/033 b/tests/nvme/033
index 6cc4f57e6d60..cb120e20b573 100755
--- 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 3bd1c3ad2f61..98a7db859b36 100755
--- 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 01aa09077d6a..c17e8be6ce46 100755
--- 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 89ccd256a67c..a1ae74fa95ea 100755
--- 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 a2815b3ff2d7..eb47839a4289 100755
--- 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 9ce2fd787f8d..1dd1072f9ffb 100644
--- 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}")
--
2.44.0
