fabrics: skip '/dev/' prefix for persistent discovery controllers

When calling 'nvme discover --device' one has to remember to strip the
'/dev/' prefix from the nvme controller device name, which is
quite cumbersome and pointless, as we might as well do it internally.
So be a bit more lenient and accept full device node names on discover.

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

diff --git a/fabrics.c b/fabrics.c
index 258da50cc8a8578a5bdded2ebd939bb643782743..fb55e331a9a5446f6ba560552613c2aaae80ac15 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -439,8 +439,12 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
                ret = ENOMEM;
                goto out_free;
        }
-       if (device && !strcmp(device, "none"))
-               device = NULL;
+       if (device) {
+               if (!strcmp(device, "none"))
+                       device = NULL;
+               else if (!strncmp(device, "/dev/", 5))
+                       device += 5;
+       }
 
        if (!device && !transport && !traddr) {
                ret = discover_from_conf_file(h, desc, connect, &cfg);