NVMe: Use requested sync command timeout

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit f4ff414aeb472397d3b4fc15c22ca65bab219ec8)

Orabug: 25130845
Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index fb44925c39a70466ad89d7ebcce9b9f255913ad9..8638039f2c0e02c1076cd8364d8f771c6ba17083 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1027,7 +1027,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
        req->__sector = (sector_t) -1;
        req->bio = req->biotail = NULL;
 
-       req->timeout = ADMIN_TIMEOUT;
+       req->timeout = timeout ? timeout : ADMIN_TIMEOUT;
 
        req->cmd = (unsigned char *)cmd;
        req->cmd_len = sizeof(struct nvme_command);