diff options
author | Keith Busch <keith.busch@intel.com> | 2013-04-19 16:11:06 -0400 |
---|---|---|
committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-05-02 15:36:02 -0400 |
commit | 78f8d2577bd79ce9d62f4d9e6d3b895bd1dd1d1d (patch) | |
tree | 95cd85a20e7b352a9d8810f831cd79f82061e54b /drivers/block | |
parent | f410c680b5344f1cb63ff011c6ae3d4963f45c30 (diff) |
NVMe: Schedule timeout for sync commands
Schedule a timeout on sync commands in case the command times out and
the device is not being polled for timeouts. This prevents device removal
from hanging forever if the device has stopped responding.
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 5a3f2235892a..a232dfc1cd4a 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c | |||
@@ -828,7 +828,7 @@ int nvme_submit_sync_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd, | |||
828 | 828 | ||
829 | set_current_state(TASK_KILLABLE); | 829 | set_current_state(TASK_KILLABLE); |
830 | nvme_submit_cmd(nvmeq, cmd); | 830 | nvme_submit_cmd(nvmeq, cmd); |
831 | schedule(); | 831 | schedule_timeout(timeout); |
832 | 832 | ||
833 | if (cmdinfo.status == -EINTR) { | 833 | if (cmdinfo.status == -EINTR) { |
834 | nvme_abort_command(nvmeq, cmdid); | 834 | nvme_abort_command(nvmeq, cmdid); |