[PATCH blktests v1 02/18] nvme/rc: silence fcloop cleanup failures
Daniel Wagner
dwagner at suse.de
Thu Mar 21 02:47:11 PDT 2024
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 at 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
More information about the Linux-nvme
mailing list