From: Keith Busch <keith.busch@intel.com>
Date: Thu, 28 May 2015 15:48:54 +0000 (-0600)
Subject: NVMe: Use requested sync command timeout
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4ff414aeb472397d3b4fc15c22ca65bab219ec8;p=linux-beck.git

NVMe: Use requested sync command timeout

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index c42bc53f3765..4eb9917b2a7a 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1014,7 +1014,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);