From b2163fa15c5f1c08f9d12f6e84a8fd42b64b0869 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Thu, 8 Jun 2017 12:11:48 -0700 Subject: [PATCH] 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 Reviewed-by: Ashok Vairavan Signed-off-by: Brian Maly --- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, -- 2.50.1