From dbb64bc21796f51d0cb0208e4460375d976320f0 Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Mon, 14 May 2018 12:52:38 -0700 Subject: [PATCH] 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 --- tests/nvme/004 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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" -- 2.51.0