X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=246dfb16c3d988c4f84749065a66977b825c98b5;hb=a688a04aab72a775e07fe460f563b46f7791cfc1;hp=56c025894cdf2d73f78c5346c9c5987d5deb0e37;hpb=6e2028aaa1373081e553d4442736ce0d1dd279e8;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 56c025894cdf..246dfb16c3d9 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -190,6 +190,9 @@ void blk_add_timer(struct request *req)
 	struct request_queue *q = req->q;
 	unsigned long expiry;
 
+	if (req->cmd_flags & REQ_NO_TIMEOUT)
+		return;
+
 	/* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */
 	if (!q->mq_ops && !q->rq_timed_out_fn)
 		return;