]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nvme-fabrics: remove unnecessary controller subnqn validation
authorJames Smart <jsmart2021@gmail.com>
Sat, 12 May 2018 00:50:22 +0000 (17:50 -0700)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 May 2018 14:50:15 +0000 (16:50 +0200)
After creating the nvme controller, nvmf_create_ctrl() validates
the newly created subsysnqn vs the one specified by the options.

In general, this is an unnecessary check as the Connect message
should implicitly ensure this value matches.

With the change to the FC transport to do an asynchronous connect
for the first association create, the transport will return to
nvmf_create_ctrl() before that first association has been established,
thus the subnqn will not yet be set.

Remove the unnecessary validation.

Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/fabrics.c

index 7ae732a77fe8fac8818bc3482f6b5ddece95c732..6fdf499d16b4e0ae9fd2f1608b5d3895cf726bea 100644 (file)
@@ -983,16 +983,6 @@ nvmf_create_ctrl(struct device *dev, const char *buf, size_t count)
                goto out_module_put;
        }
 
-       if (strcmp(ctrl->subsys->subnqn, opts->subsysnqn)) {
-               dev_warn(ctrl->device,
-                       "controller returned incorrect NQN: \"%s\".\n",
-                       ctrl->subsys->subnqn);
-               module_put(ops->module);
-               up_read(&nvmf_transports_rwsem);
-               nvme_delete_ctrl_sync(ctrl);
-               return ERR_PTR(-EINVAL);
-       }
-
        module_put(ops->module);
        up_read(&nvmf_transports_rwsem);
        return ctrl;