From: Jens Axboe <axboe@fb.com>
Date: Fri, 30 May 2014 21:42:56 +0000 (-0600)
Subject: blk-mq: remember to start timeout handler for direct queue
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=feff6894128e4bb3c903ce247edc5bd3a1b09fc9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

blk-mq: remember to start timeout handler for direct queue

Commit 07068d5b8e added a direct-to-hw-queue mode, but this mode
needs to remember to add the request timeout handler as well.
Without it, we don't track timeouts for these requests.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 71f564e8812e..5443aea36542 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1217,6 +1217,7 @@ static void blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
 		blk_mq_bio_to_request(rq, bio);
 		blk_mq_start_request(rq, true);
+		blk_add_timer(rq);
 
 		/*
 		 * For OK queue, we are done. For error, kill it. Any other