| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1411134826-6772-1-git-send-email-ming.lei@canonical.com> Date: Fri, 19 Sep 2014 21:53:46 +0800 From: Ming Lei <ming.lei@...onical.com> To: linux-kernel@...r.kernel.org, Christoph Hellwig <hch@....de> Cc: Jens Axboe <axboe@...nel.dk>, Ming Lei <ming.lei@...onical.com> Subject: [PATCH] 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); then cause blk_add_timer() to do nop in case of blk-mq. This patch fixes the problem by bypassing the check for blk-mq. Signe-off-by: Ming Lei <ming.lei@...onical.com> --- block/blk-timeout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 4d44825..0c2375c 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) + /* mq needn't the handler */ + if (!q->mq_ops && !q->rq_timed_out_fn) return; BUG_ON(!list_empty(&req->timeout_list)); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists