From: Hannes Reinecke <hare@suse.de>
Date: Wed, 16 Mar 2022 14:32:06 +0000 (+0100)
Subject: fabrics: check for discovery controller instead of subsystem NQN
X-Git-Tag: v2.0-rc7~12^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1d83749121323f56d8b38e25d9d165adf5a4fea6;p=users%2Fsagi%2Fnvme-cli.git

fabrics: check for discovery controller instead of subsystem NQN

Unique discovery subsystems have a unique subsystem NQN, to we cannot
check for the standard discovery NQN when checking for persistent
discovery controllers, but rather have to check if the subsystem is a
discovery subsystem.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/fabrics.c b/fabrics.c
index 73c887a4..743d18b8 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -509,7 +509,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 		c = nvme_scan_ctrl(r, device);
 		if (c) {
 			/* Check if device matches command-line options */
-			if (strcmp(nvme_ctrl_get_subsysnqn(c), subsysnqn) ||
+			if (!nvme_ctrl_is_discovery_ctrl(c) ||
 			    strcmp(nvme_ctrl_get_transport(c), transport) ||
 			    strcasecmp(nvme_ctrl_get_traddr(c), traddr) ||
 			    (cfg.host_traddr && nvme_ctrl_get_host_traddr(c) &&