Commit f5e350f0 authored Jun 22, 2018 by Bart Van Assche Committed by Jens Axboe Jun 23, 2018

blk-mq: Fix timeout handling in case the timeout handler returns BLK_EH_DONE



Make sure that RQF_TIMED_OUT is cleared when a request is reused
after a block driver timeout handler has returned BLK_EH_DONE.

Fixes: da661267 ("blk-mq: don't time out requests again that are in the timeout handler")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jianchao Wang <jianchao.w.wang@oracle.com>
Cc: Andrew Randrianasulu <randrianasulu@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 3ee7e869

block/blk-mq.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -781,7 +781,6 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved)
		WARN_ON_ONCE(ret != BLK_EH_RESET_TIMER);
		}

		req->rq_flags &= ~RQF_TIMED_OUT;
		blk_add_timer(req);
		}

block/blk-timeout.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ void blk_add_timer(struct request *req)
		if (!req->timeout)
		req->timeout = q->rq_timeout;

		req->rq_flags &= ~RQF_TIMED_OUT;
		blk_rq_set_deadline(req, jiffies + req->timeout);

		/*