From: Omar Sandoval <osandov@fb.com>
Date: Mon, 14 May 2018 19:52:38 +0000 (-0700)
Subject: nvme/004: fix _find_nvme_loop_dev and cat
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbb64bc21796f51d0cb0208e4460375d976320f0;p=users%2Fsagi%2Fblktests.git

nvme/004: fix _find_nvme_loop_dev and cat

We were looking at the wrong paths. Based on a patch from Johannes
Thumshirn.

Signed-off-by: Omar Sandoval <osandov@fb.com>
---

diff --git a/tests/nvme/004 b/tests/nvme/004
index 65bcd40..f18158a 100755
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -28,9 +28,9 @@ requires() {
 }
 
 _find_nvme_loop_dev() {
-	for dev in /sys/block/nvme*; do
+	for dev in /sys/class/nvme/nvme*; do
 		dev="$(basename "$dev")"
-		transport="$(cat "/sys/block/${dev}/device/transport")"
+		transport="$(cat "/sys/class/nvme/${dev}/transport")"
 		if [[ "$transport" == "loop" ]]; then
 			echo "$dev"
 		fi
@@ -59,8 +59,8 @@ test() {
 
 	local nvmedev
 	nvmedev="$(_find_nvme_loop_dev)"
-	cat "/sys/block/${nvmedev}/uuid"
-	cat "/sys/block/${nvmedev}/wwid"
+	cat "/sys/block/${nvmedev}n1/uuid"
+	cat "/sys/block/${nvmedev}n1/wwid"
 
 	_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
 	_remove_nvmet_subsystem "blktests-subsystem-1"