nvme: make argument to _find_nvme_dev() optional

Most callers use the default subsystem NQN as argument to _find_nvme_ns(), so make it optional. Signed-off-by: Hannes Reinecke <[email protected]>
osandov · hreinecke · Sep 26, 2024 · Sep 27, 2024 · Sep 27, 2024 · Oct 1, 2024
commit 9dff04fc9f0910514f4a804f5ccf4cc485271b2a
diff --git a/common/nvme b/common/nvme
@@ -730,7  730,7 @@ _get_nvmet_port_params() {
 }
 
 _find_nvme_dev() {
-	local subsys=$1
 	local subsys="${1:-$def_subsysnqn}"
 	local subsysnqn
 	local dev
 	for dev in /sys/class/nvme/nvme*; do

diff --git a/tests/nvme/004 b/tests/nvme/004
@@ -31,7  31,7 @@ test() {
 	_nvme_connect_subsys
 
 	local nvmedev
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 	_check_uuid "${nvmedev}"
 
 	_nvme_disconnect_subsys

diff --git a/tests/nvme/005 b/tests/nvme/005
@@ -31,7  31,7 @@ test() {
 
 	_nvme_connect_subsys
 
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 
 	echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
 

diff --git a/tests/nvme/008 b/tests/nvme/008
@@ -30,7  30,7 @@ test() {
 
 	_nvme_connect_subsys
 
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 	_check_uuid "${nvmedev}"
 
 	_nvme_disconnect_subsys

diff --git a/tests/nvme/022 b/tests/nvme/022
@@ -30,7  30,7 @@ test() {
 
 	_nvme_connect_subsys
 
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 	_check_uuid "${nvmedev}"
 
 	if ! nvme reset "/dev/${nvmedev}" >> "$FULL" 2>&1; then

diff --git a/tests/nvme/027 b/tests/nvme/027
@@ -30,7  30,7 @@ test() {
 
 	_nvme_connect_subsys
 
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 	_check_uuid "${nvmedev}"
 
 	if ! nvme ns-rescan "/dev/${nvmedev}" >> "$FULL" 2>&1; then

diff --git a/tests/nvme/036 b/tests/nvme/036
@@ -35,7  35,7 @@ test_device() {
 	if [[ -z "$nsdev" ]]; then
 		echo "FAIL: Failed to find passthru target namespace"
 	else
-		ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
 		ctrldev=$(_find_nvme_dev)
 
 		if ! nvme reset "/dev/${ctrldev}" >> "$FULL" 2>&1; then
 			echo "ERROR: reset failed"

diff --git a/tests/nvme/040 b/tests/nvme/040
@@ -32,7  32,7 @@ test() {
 	_nvmet_target_setup
 
 	_nvme_connect_subsys
-	nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 	nvmedev=$(_find_nvme_dev)
 	ns=$(_find_nvme_ns "${def_subsys_uuid}")
 
 	# start fio job

diff --git a/tests/nvme/045 b/tests/nvme/045
@@ -60,7  60,7 @@ test() {
 
 	echo "Re-authenticate with original host key"
 
-	ctrldev=$(_find_nvme_dev "${def_subsysnqn}")
 	ctrldev=$(_find_nvme_dev)
 	if [ -z "$ctrldev" ] ; then
 		echo "nvme controller not found"
 	fi