summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2015-05-28 09:48:54 -0600
committerJens Axboe <axboe@fb.com>2015-05-29 10:10:29 -0600
commitf4ff414aeb472397d3b4fc15c22ca65bab219ec8 (patch)
treea1d3071e6ce4a6b620763a629c1c2a37bc3a2856
parenta0a931d6a2c1fbc5d5966ebf0e7a043748692c22 (diff)
NVMe: Use requested sync command timeout
Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/nvme-core.c2
1 files changed, 1 insertions, 1 deletions
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);