diff options
| author | Hannes Reinecke <hare@suse.de> | 2018-05-24 16:18:15 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-25 16:50:12 +0200 |
| commit | 461fbc8f0ed1ac18ce6b7bf7ab0b7444f7c7ff57 (patch) | |
| tree | 46c4eb92a064c1e0b0d8ed89f010cb4d4e9aabf1 | |
| parent | nvme-fabrics: remove unnecessary controller subnqn validation (diff) | |
| download | linux-461fbc8f0ed1ac18ce6b7bf7ab0b7444f7c7ff57.tar.xz linux-461fbc8f0ed1ac18ce6b7bf7ab0b7444f7c7ff57.zip | |
nvme-fabrics: centralize discovery controller defaults
When connecting to the discovery controller we have certain defaults
to observe, so centralize them to avoid inconsistencies due to argument
ordering.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index 6fdf499d16b4..5ad6104577f0 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -689,10 +689,6 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, opts->discovery_nqn = !(strcmp(opts->subsysnqn, NVME_DISC_SUBSYS_NAME)); - if (opts->discovery_nqn) { - opts->kato = 0; - opts->nr_io_queues = 0; - } break; case NVMF_OPT_TRADDR: p = match_strdup(args); @@ -851,6 +847,10 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, } } + if (opts->discovery_nqn) { + opts->kato = 0; + opts->nr_io_queues = 0; + } if (ctrl_loss_tmo < 0) opts->max_reconnects = -1; else |