diff options
| author |   Keith Busch <keith.busch@intel.com> | 2015-05-28 09:48:54 -0600 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-05-29 10:10:29 -0600 |
| commit | f4ff414aeb472397d3b4fc15c22ca65bab219ec8 (patch) | |
| tree | a1d3071e6ce4a6b620763a629c1c2a37bc3a2856 /drivers/block/nvme-core.c | |
| parent | NVMe: Fix obtaining command result (diff) | |
| download | linux-dev-f4ff414aeb472397d3b4fc15c22ca65bab219ec8.tar.xz linux-dev-f4ff414aeb472397d3b4fc15c22ca65bab219ec8.zip | |
NVMe: Use requested sync command timeout
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 2 |
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); |