From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Thu, 8 Jun 2017 19:11:48 +0000 (-0700)
Subject: nvme: Remove timeout when deleting queue
X-Git-Tag: v4.1.12-104.0.20170618_1145~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b2163fa15c5f1c08f9d12f6e84a8fd42b64b0869;p=users%2Fjedix%2Flinux-maple.git

nvme: Remove timeout when deleting queue

Avoid waiting for ADMIN_TIMEOUT when deleting a queue since chances are
that the controller is wedged.

Orabug: 26277582

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e61034ccadd7..62ffd620828a 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1562,7 +1562,8 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode)
 	if (IS_ERR(req))
 		return PTR_ERR(req);
 
-	req->timeout = ADMIN_TIMEOUT;
+	req->timeout = 0;
+	req->cmd_flags |= REQ_NO_TIMEOUT;
 	req->end_io_data = nvmeq;
 
 	blk_execute_rq_nowait(q, NULL, req, false,