]> git.baikalelectronics.ru Git - kernel.git/commit
blk-timeout: fix blk_add_timer
authorMing Lei <ming.lei@canonical.com>
Fri, 19 Sep 2014 13:53:46 +0000 (21:53 +0800)
committerJens Axboe <axboe@fb.com>
Mon, 22 Sep 2014 18:00:08 +0000 (12:00 -0600)
commit7464cbc0525cb1054ae098a9cc498c05f15a0b56
tree7b38546a459da2783a5f07de301eb11756ac66d3
parenta1a02348fd48645a381ebaa786c884f12fef54cc
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>
block/blk-timeout.c