diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
| commit | 134933e55789ece9bca973d3502c7b8f7a9dae86 (patch) | |
| tree | b1694310855e43acb5fceb8b2d55ec8cd713ccad /drivers/nvme/host/fabrics.c | |
| parent | 24868367cdcac447232ebcb2aa06e1bf91291586 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
| download | linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.gz linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.bz2 linux-134933e55789ece9bca973d3502c7b8f7a9dae86.zip | |
Merge tag 'v4.16-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvme/host/fabrics.c')
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index a1c58e35075e..8f0f34d06d46 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -650,6 +650,11 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, ret = -EINVAL; goto out; } + if (opts->discovery_nqn) { + pr_debug("Ignoring nr_io_queues value for discovery controller\n"); + break; + } + opts->nr_io_queues = min_t(unsigned int, num_online_cpus(), token); break; |