path: root/block/blk-mq.h
diff options
authorMing Lei <>2014-09-19 21:53:46 +0800
committerJens Axboe <>2014-09-22 12:00:08 -0600
commit5e940aaa597c15e916618240ae5838864f36c91e (patch)
tree7b38546a459da2783a5f07de301eb11756ac66d3 /block/blk-mq.h
parentaedcd72f6c283dffefbb8b808ae67bdd2c6eb11a (diff)
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 <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/blk-mq.h')
0 files changed, 0 insertions, 0 deletions