diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-01-10 23:29:57 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-01-10 23:29:57 +0100 |
| commit | a39c330d7436530151a619319f7ff6e9b3a6d8c6 (patch) | |
| tree | 72897be498ee7874994002a988304327d9aabd28 /drivers/nvme/host/fabrics.c | |
| parent | loop: drop caches if offset or block_size are changed (diff) | |
| parent | nvme: don't initlialize ctrl->cntlid twice (diff) | |
| download | linux-a39c330d7436530151a619319f7ff6e9b3a6d8c6.tar.xz linux-a39c330d7436530151a619319f7ff6e9b3a6d8c6.zip | |
Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Christoph.
* 'nvme-5.0' of git://git.infradead.org/nvme:
nvme: don't initlialize ctrl->cntlid twice
nvme: introduce NVME_QUIRK_IGNORE_DEV_SUBNQN
nvme: pad fake subsys NQN vid and ssvid with zeros
nvme-multipath: zero out ANA log buffer
nvme-fabrics: unset write/poll queues for discovery controllers
nvme-tcp: don't ask if controller is fabrics
nvme-tcp: remove dead code
nvme-pci: fix out of bounds access in nvme_cqe_pending
nvme-pci: rerun irq setup on IO queue init errors
nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
nvme-pci: fix the wrong setting of nr_maps
Diffstat (limited to 'drivers/nvme/host/fabrics.c')
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index b2ab213f43de..3eb908c50e1a 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -874,6 +874,8 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, if (opts->discovery_nqn) { opts->kato = 0; opts->nr_io_queues = 0; + opts->nr_write_queues = 0; + opts->nr_poll_queues = 0; opts->duplicate_connect = true; } if (ctrl_loss_tmo < 0) |