From: Daniel Wagner <dwagner@suse.de>
To: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Chaitanya Kulkarni <chaitanyak@nvidia.com>,
Hannes Reinecke <hare@suse.de>, Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests v1 02/18] nvme/rc: silence fcloop cleanup failures
Date: Thu, 21 Mar 2024 10:47:11 +0100 [thread overview]
Message-ID: <20240321094727.6503-3-dwagner@suse.de> (raw)
In-Reply-To: <20240321094727.6503-1-dwagner@suse.de>
When the ctl file is missing we are logging
tests/nvme/rc: line 265: /sys/class/fcloop/ctl/del_target_port: No such file or directory
tests/nvme/rc: line 257: /sys/class/fcloop/ctl/del_local_port: No such file or directory
tests/nvme/rc: line 249: /sys/class/fcloop/ctl/del_remote_port: No such file or directory
because the first redirect operator fails. Thus first check if the ctl
file exists.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
tests/nvme/rc | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/tests/nvme/rc b/tests/nvme/rc
index 78d84af72e73..53fa54e64cb2 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -234,7 +234,10 @@ _nvme_fcloop_del_rport() {
local remote_wwpn="$4"
local loopctl=/sys/class/fcloop/ctl
- echo "wwnn=${remote_wwnn},wwpn=${remote_wwpn}" > ${loopctl}/del_remote_port 2> /dev/null
+ if [[ ! -f "${loopctrl}" ]]; then
+ return
+ fi
+ echo "wwnn=${remote_wwnn},wwpn=${remote_wwpn}" > ${loopctl}/del_remote_port > /dev/null 2>&1
}
_nvme_fcloop_del_lport() {
@@ -242,7 +245,10 @@ _nvme_fcloop_del_lport() {
local wwpn="$2"
local loopctl=/sys/class/fcloop/ctl
- echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_local_port 2> /dev/null
+ if [[ ! -f "${loopctrl}" ]]; then
+ return
+ fi
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_local_port > /dev/null > /dev/null 2>&1
}
_nvme_fcloop_del_tport() {
@@ -250,7 +256,10 @@ _nvme_fcloop_del_tport() {
local wwpn="$2"
local loopctl=/sys/class/fcloop/ctl
- echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_target_port 2> /dev/null
+ if [[ ! -f "${loopctrl}" ]]; then
+ return
+ fi
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_target_port > /dev/null 2&>1
}
_cleanup_fcloop() {
--
2.44.0
next prev parent reply other threads:[~2024-03-21 11:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 9:47 [PATCH blktests v1 00/18] refactoring and various cleanups/fixes Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 01/18] nvme/rc: silence error on module unload for fc Daniel Wagner
2024-03-21 9:47 ` Daniel Wagner [this message]
2024-03-21 9:57 ` [PATCH blktests v1 02/18] nvme/rc: silence fcloop cleanup failures Daniel Wagner
2024-03-22 9:14 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 03/18] nvme/rc: log error if stale configuration is found Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 04/18] common/xfs: propagate errors from _xfs_run_fio_verify_io Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 05/18] nvme/{012,013,035}: check return value of _xfs_run_fio_verify_io Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 06/18] nvme/rc: use long command line option for nvme Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 07/18] nvme/{014,015,018,019,020,023,024,026,045,046}: " Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 08/18] nvme/rc: connect subsys only support long options Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 09/18] nvme/rc: add nqn/uuid args to target setup/cleanup helper Daniel Wagner
2024-03-22 9:17 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 10/18] nvme/rc: remove unused connect options Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 11/18] nvme/rc: remove correct port from target Daniel Wagner
2024-03-22 9:19 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 12/18] nvme/031: do not open code target setup/cleanup Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 13/18] nvme/{rc,031}: do not cleanup external managed loop device Daniel Wagner
2024-03-22 9:21 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 14/18] nvme: drop default trtype argument for _nvmet_connect_subsys Daniel Wagner
2024-03-22 9:23 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 15/18] nvme: drop default subsysnqn argument from _nvme_{connect|disconnect}_subsys Daniel Wagner
2024-03-22 9:26 ` Shinichiro Kawasaki
2024-03-21 9:47 ` [PATCH blktests v1 16/18] nvme/{041,042,043,044,045,048}: do not pass default host{nqn|id} to _nvme_connect_subsys Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 17/18] nvme: don't assume namespace id Daniel Wagner
2024-03-21 10:19 ` Daniel Wagner
2024-03-22 9:35 ` Shinichiro Kawasaki
2024-03-22 12:34 ` Daniel Wagner
2024-03-21 9:47 ` [PATCH blktests v1 18/18] nvme/028: drop unused nvmedev Daniel Wagner
2024-03-22 9:38 ` [PATCH blktests v1 00/18] refactoring and various cleanups/fixes Shinichiro Kawasaki
2024-03-22 12:35 ` 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=20240321094727.6503-3-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=chaitanyak@nvidia.com \
--cc=hare@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--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