summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2014-09-19 17:53:46 +0400
committerJens Axboe <axboe@fb.com>2014-09-22 22:00:08 +0400
commit5e940aaa597c15e916618240ae5838864f36c91e (patch)
tree7b38546a459da2783a5f07de301eb11756ac66d3 /block
parentaedcd72f6c283dffefbb8b808ae67bdd2c6eb11a (diff)
downloadlinux-5e940aaa597c15e916618240ae5838864f36c91e.tar.xz
blk-timeout: fix blk_add_timer
Commit 8cb34819cdd5d(blk-mq: unshared timeout handler) introduces blk-mq's own timeout handler, and removes following line: blk_queue_rq_timed_out(q, blk_mq_rq_timed_out); which then causes blk_add_timer() to bypass adding the timer, since blk-mq no longer has q->rq_timed_out_fn defined. This patch fixes the problem by bypassing the check for blk-mq, so that both request deadlines are still set and the rolling timer updated. Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-timeout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 4d448259e622..8bae410b8a1b 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -186,7 +186,8 @@ void blk_add_timer(struct request *req)
struct request_queue *q = req->q;
unsigned long expiry;
- if (!q->rq_timed_out_fn)
+ /* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */
+ if (!q->mq_ops && !q->rq_timed_out_fn)
return;
BUG_ON(!list_empty(&req->timeout_list));