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)
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>

No differences found