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 e61034ccadd7278f9b9849b9c2ce74f5af0c1193..62ffd620828a4378ad5a4f558e381b6645dd2337 100644 (file)
--- 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,