diff options
| author | Keith Busch <keith.busch@intel.com> | 2016-05-06 19:50:52 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-05-18 01:14:21 +0200 |
| commit | 014a0d609eb4721d1e416cf10da2d5602f9b34d5 (patch) | |
| tree | 114e80a77d807bb2fe52d0c76862773711587ea7 | |
| parent | NVMe: Allocate queues only for online cpus (diff) | |
| download | linux-014a0d609eb4721d1e416cf10da2d5602f9b34d5.tar.xz linux-014a0d609eb4721d1e416cf10da2d5602f9b34d5.zip | |
NVMe: Delete only created queues
Use the online queue count instead of the number of allocated queues. The
controller should just return an invalid queue identifier error to the
commands if a queue wasn't created. While it's not harmful, it's still
not correct.
Reported-by: Saar Gross <saar@annapurnalabs.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 3c7b625a5e56..88ed43d0799c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1551,12 +1551,12 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) static void nvme_disable_io_queues(struct nvme_dev *dev) { - int pass; + int pass, queues = dev->online_queues - 1; unsigned long timeout; u8 opcode = nvme_admin_delete_sq; for (pass = 0; pass < 2; pass++) { - int sent = 0, i = dev->queue_count - 1; + int sent = 0, i = queues; reinit_completion(&dev->ioq_wait); retry: |