From: Ming Lei <ming.lei@canonical.com>
Date: Fri, 19 Sep 2014 13:53:46 +0000 (+0800)
Subject: blk-timeout: fix blk_add_timer
X-Git-Tag: fixes-against-v3.18-rc2~51^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e940aaa597c15e916618240ae5838864f36c91e;p=pandora-kernel.git

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

Reading git-diff-tree failed