diff options
| author | Keith Busch <keith.busch@intel.com> | 2013-05-09 22:01:38 +0200 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-05-09 22:03:50 +0200 |
| commit | 94f370cab6e5ac514b658c6b2b3aa308cefc5c7a (patch) | |
| tree | 3e1a2ea879a0087b6c5238e2f61770e66b5854dc /drivers | |
| parent | NVMe: Simplify Firmware Activate code slightly (diff) | |
| download | linux-94f370cab6e5ac514b658c6b2b3aa308cefc5c7a.tar.xz linux-94f370cab6e5ac514b658c6b2b3aa308cefc5c7a.zip | |
NVMe: Use user defined admin ioctl timeout
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/nvme-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 310d573b9e8d..8efdfaa44a59 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1392,6 +1392,7 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev, struct nvme_command c; int status, length; struct nvme_iod *uninitialized_var(iod); + unsigned timeout; if (!capable(CAP_SYS_ADMIN)) return -EACCES; @@ -1421,10 +1422,13 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev, GFP_KERNEL); } + timeout = cmd.timeout_ms ? msecs_to_jiffies(cmd.timeout_ms) : + ADMIN_TIMEOUT; if (length != cmd.data_len) status = -ENOMEM; else - status = nvme_submit_admin_cmd(dev, &c, &cmd.result); + status = nvme_submit_sync_cmd(dev->queues[0], &c, &cmd.result, + timeout); if (cmd.data_len) { nvme_unmap_user_pages(dev, cmd.opcode & 1, iod); |