summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2016-05-06 11:50:52 -0600
committerJens Axboe <axboe@fb.com>2016-05-17 17:14:21 -0600
commit014a0d609eb4721d1e416cf10da2d5602f9b34d5 (patch)
tree114e80a77d807bb2fe52d0c76862773711587ea7 /drivers/nvme
parent2800b8e7d9dfca1fd9d044dcf7a046b5de5a7239 (diff)
downloadop-kernel-dev-014a0d609eb4721d1e416cf10da2d5602f9b34d5.zip
op-kernel-dev-014a0d609eb4721d1e416cf10da2d5602f9b34d5.tar.gz
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>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 3c7b625..88ed43d 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:
OpenPOWER on IntegriCloud