summaryrefslogtreecommitdiffstats
path: root/block/blk-timeout.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-09-22 10:21:48 -0600
committerJens Axboe <axboe@fb.com>2014-09-22 12:00:08 -0600
commit90415837659fec54f33584b423dab250eb1e8432 (patch)
tree6d599a1f345351b6d2304797802f4d78f7292027 /block/blk-timeout.c
parent5e940aaa597c15e916618240ae5838864f36c91e (diff)
downloadlinux-90415837659fec54f33584b423dab250eb1e8432.tar.bz2
block: fix blk_abort_request on blk-mq
Signed-off-by: Christoph Hellwig <hch@lst.de> Moved blk_mq_rq_timed_out() definition to the private blk-mq.h header. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-timeout.c')
-rw-r--r--block/blk-timeout.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 8bae410b8a1b..56c025894cdf 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -7,6 +7,7 @@
#include <linux/fault-inject.h>
#include "blk.h"
+#include "blk-mq.h"
#ifdef CONFIG_FAIL_IO_TIMEOUT
@@ -158,7 +159,10 @@ void blk_abort_request(struct request *req)
if (blk_mark_rq_complete(req))
return;
blk_delete_timer(req);
- blk_rq_timed_out(req);
+ if (req->q->mq_ops)
+ blk_mq_rq_timed_out(req, false);
+ else
+ blk_rq_timed_out(req);
}
EXPORT_SYMBOL_GPL(blk_abort_request);