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

f5e350f0 · Bart Van Assche <[email protected]> · 2018-06-22 13:18:09 -07:00

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: da6612673988 ("blk-mq: don't time out requests again that are in the timeout handler")
Signed-off-by: Bart Van Assche <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Jianchao Wang <[email protected]>
Cc: Andrew Randrianasulu <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

Commit: f5e350f021e04ea41d2e5d58487c33b05ba3d25b
Parents: 3ee7e869

Changes

2 files changed · +1 −1

File	Status	Add	Del	Content
block/blk-mq.c	modified	+0	−1	View file
block/blk-timeout.c	modified	+1	−0	View file

block/blk-mq.c

View file

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 8e57b84..b6888ff 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -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

View file

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 4b8a48d..f2cfd56 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -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);
 
 	/*