From: Daniel Wagner <dwagner@suse.de>
To: linux-nvme@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
Chaitanya Kulkarni <kch@nvidia.com>,
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>,
Hannes Reinecke <hare@suse.de>, Sagi Grimberg <sagi@grimberg.me>,
Jason Gunthorpe <jgg@ziepe.ca>,
Bart Van Assche <bvanassche@acm.org>,
Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests v4 1/3] nvme/{033,034,035,036}: use default subsysnqn variable directly
Date: Wed, 30 Aug 2023 11:20:17 +0200 [thread overview]
Message-ID: <20230830092019.9846-2-dwagner@suse.de> (raw)
In-Reply-To: <20230830092019.9846-1-dwagner@suse.de>
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>
---
tests/nvme/033 | 9 ++++-----
tests/nvme/034 | 9 ++++-----
tests/nvme/035 | 9 ++++-----
tests/nvme/036 | 11 +++++------
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/tests/nvme/033 b/tests/nvme/033
index 46a520ae01fa..d924883460c2 100755
--- 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 3c65d92cbaea..e79eef5e756d 100755
--- 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 c705d9cf25a4..f0dfc92ceeea 100755
--- 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 2e933cc41928..61b9e2309da7 100755
--- 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"
}
--
2.41.0
next prev parent reply other threads:[~2023-08-30 19:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 9:20 [PATCH blktests v4 0/3] Introduce nvmet target setup/cleanup helpers Daniel Wagner
2023-08-30 9:20 ` Daniel Wagner [this message]
2023-08-30 9:20 ` [PATCH blktests v4 2/3] nvme/{033,034,035,036,37}: drop port handle between passthru target setup and cleanup Daniel Wagner
2023-08-30 9:20 ` [PATCH blktests v4 3/3] nvme: introduce nvmet_target_{setup/cleanup} common code Daniel Wagner
2023-08-30 13:38 ` Shinichiro Kawasaki
2023-08-30 15:06 ` Daniel Wagner
2023-08-31 2:25 ` [PATCH blktests v4 0/3] Introduce nvmet target setup/cleanup helpers Shinichiro Kawasaki
2023-08-31 8:03 ` Chaitanya Kulkarni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230830092019.9846-2-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=bvanassche@acm.org \
--cc=hare@suse.de \
--cc=jgg@ziepe.ca \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=shinichiro.kawasaki@wdc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox