From: Keith Busch <keith.busch@intel.com>
Date: Fri, 6 May 2016 17:50:52 +0000 (-0600)
Subject: NVMe: Delete only created queues
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=014a0d609eb4721d1e416cf10da2d5602f9b34d5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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: