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 73c887a4945c95b9ccab7fbc7ebe1e0c19c8a685..743d18b80c9fc834c9b259954be57459a038946c 100644 (file)
--- 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) &&