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>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Hannes Reinecke <hare@suse.de>, Sagi Grimberg <sagi@grimberg.me>,
James Smart <jsmart2021@gmail.com>,
Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests v1 01/11] nvme/{003,004,005,013,046,049}: Group all variables declarations
Date: Wed, 26 Jul 2023 14:46:34 +0200 [thread overview]
Message-ID: <20230726124644.12619-2-dwagner@suse.de> (raw)
In-Reply-To: <20230726124644.12619-1-dwagner@suse.de>
Group all variable declarations together at the beginning of the
function.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
tests/nvme/003 | 3 ++-
tests/nvme/004 | 3 ++-
tests/nvme/005 | 5 +++--
tests/nvme/013 | 1 -
tests/nvme/046 | 1 +
tests/nvme/049 | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/nvme/003 b/tests/nvme/003
index 6604012d2068..aa26abf8d8b3 100755
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -22,10 +22,11 @@ test() {
_setup_nvmet
+ local loop_dev
local port
+
port="$(_create_nvmet_port "${nvme_trtype}")"
- local loop_dev
loop_dev="$(losetup -f)"
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}"
diff --git a/tests/nvme/004 b/tests/nvme/004
index cab98ff44326..1e5c2b8b3e87 100755
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -23,11 +23,12 @@ test() {
_setup_nvmet
local port
+ local loop_dev
+
port="$(_create_nvmet_port "${nvme_trtype}")"
truncate -s "${nvme_img_size}" "$TMPDIR/img"
- local loop_dev
loop_dev="$(losetup -f --show "$TMPDIR/img")"
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
diff --git a/tests/nvme/005 b/tests/nvme/005
index 8e15a13f3794..836854086822 100755
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -22,11 +22,13 @@ test() {
_setup_nvmet
local port
+ local loop_dev
+ local nvmedev
+
port="$(_create_nvmet_port "${nvme_trtype}")"
truncate -s "${nvme_img_size}" "$TMPDIR/img"
- local loop_dev
loop_dev="$(losetup -f --show "$TMPDIR/img")"
_create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
@@ -35,7 +37,6 @@ test() {
_nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
- local nvmedev
nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
udevadm settle
diff --git a/tests/nvme/013 b/tests/nvme/013
index 14e646a19c47..2be8681616d1 100755
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -26,7 +26,6 @@ test() {
local port
local nvmedev
local file_path="${TMPDIR}/img"
-
local subsys_name="blktests-subsystem-1"
truncate -s "${nvme_img_size}" "${file_path}"
diff --git a/tests/nvme/046 b/tests/nvme/046
index b37b9e98a559..942f25206c17 100755
--- a/tests/nvme/046
+++ b/tests/nvme/046
@@ -16,6 +16,7 @@ requires() {
test_device() {
echo "Running ${TEST_NAME}"
+
local ngdev=${TEST_DEV/nvme/ng}
local perm nsid
diff --git a/tests/nvme/049 b/tests/nvme/049
index f72862c6426d..599ab58d7a29 100755
--- a/tests/nvme/049
+++ b/tests/nvme/049
@@ -17,6 +17,7 @@ requires() {
test_device() {
echo "Running ${TEST_NAME}"
+
local ngdev=${TEST_DEV/nvme/ng}
local common_args=(
--size=1M
--
2.41.0
next prev parent reply other threads:[~2023-07-26 12:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-26 12:46 [PATCH blktests v1 00/11] Switch to allowed_host Daniel Wagner
2023-07-26 12:46 ` Daniel Wagner [this message]
2023-07-26 14:54 ` [PATCH blktests v1 01/11] nvme/{003,004,005,013,046,049}: Group all variables declarations Bart Van Assche
2023-07-27 7:11 ` Daniel Wagner
2023-07-27 15:18 ` Bart Van Assche
2023-07-28 5:06 ` Shinichiro Kawasaki
2023-07-28 6:46 ` Daniel Wagner
2023-07-28 7:58 ` Shinichiro Kawasaki
2023-07-26 12:46 ` [PATCH blktests v1 02/11] nvme: Reorganize test preamble code section Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 03/11] nvme/rc: Add common subsystem nqn define Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 04/11] nvme: Use def_subsysnqn variable instead local variable Daniel Wagner
2023-07-28 8:04 ` Shinichiro Kawasaki
2023-07-26 12:46 ` [PATCH blktests v1 05/11] nvme/{041,042,043,044,045,048}: Remove local variable hostnqn and hostid Daniel Wagner
2023-07-28 8:10 ` Shinichiro Kawasaki
2023-07-28 8:52 ` Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 06/11] nvme/rc: Add common file_path name define Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 07/11] nvme: Use def_file_path variable instead local variable Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 08/11] nvme/rc: Add common def_subsys_uuid define Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 09/11] nvme: Use def_subsys_uuid variable Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 10/11] nvme/rc: Add helper for adding/removing to allow list Daniel Wagner
2023-07-26 12:46 ` [PATCH blktests v1 11/11] nvme: Add explicitly host to allow_host list Daniel Wagner
2023-07-28 8:15 ` Shinichiro Kawasaki
2023-07-28 8:55 ` Daniel Wagner
2023-07-28 8:20 ` [PATCH blktests v1 00/11] Switch to allowed_host Shinichiro Kawasaki
2023-07-28 8:59 ` Daniel Wagner
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=20230726124644.12619-2-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=hare@suse.de \
--cc=jsmart2021@gmail.com \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mgurtovoy@nvidia.com \
--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
all inboxes | Powered by JetHome®