summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2013-05-09 14:01:38 -0600
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2013-05-09 16:03:50 -0400
commit94f370cab6e5ac514b658c6b2b3aa308cefc5c7a (patch)
tree3e1a2ea879a0087b6c5238e2f61770e66b5854dc /drivers/block
parentab3ea5bf37e7189e843e19e500e7af50e802b5f6 (diff)
downloadop-kernel-dev-94f370cab6e5ac514b658c6b2b3aa308cefc5c7a.zip
op-kernel-dev-94f370cab6e5ac514b658c6b2b3aa308cefc5c7a.tar.gz
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/block')
-rw-r--r--drivers/block/nvme-core.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 310d573..8efdfaa 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);
OpenPOWER on IntegriCloud