From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 11 Feb 2019 17:08:33 +0000 (-0800)
Subject: tests/nvmeof-mp/rc: Fix simulate_network_failure_loop()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8845dc6737ac0daee6f3328528db6aa8a7b7d52e;p=users%2Fsagi%2Fblktests.git

tests/nvmeof-mp/rc: Fix simulate_network_failure_loop()

Avoid that the following is reported:

+tests/nvmeof-mp/rc: line 118: /dev/nvme0n1/device/reset_controller: Not a directory

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---

diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index 8be9c5e..d4a6511 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -107,7 +107,7 @@ log_out() {
 
 # Simulate network failures for device $1 during $2 seconds.
 simulate_network_failure_loop() {
-	local d dev="$1" duration="$2" deadline i rc=0
+	local d dev="$1" duration="$2" deadline i rc=0 sf
 
 	[ -e "$dev" ] || return $?
 	[ -n "$duration" ] || return $?
@@ -115,9 +115,10 @@ simulate_network_failure_loop() {
 	while [ $rc = 0 ]; do
 		sleep_until 5 ${deadline} || break
 		for d in $(held_by "$dev"); do
-			echo 1 >"$d/device/reset_controller"
+			sf=$(ls -d /sys/class/nvme/*/device/*/"${d#/dev/}/reset_controller")
+			echo 1 > "$sf"
 		done
-	done
+	done 2>>"$FULL"
 
 	for ((i=0;i<5;i++)); do
 		log_in && break