blk-mq: Fix timeout handling in case the timeout handler returns BLK_EH_DONE for-linus-20180623
authorBart Van Assche <bart.vanassche@wdc.com>
Fri, 22 Jun 2018 20:18:09 +0000 (13:18 -0700)
committerJens Axboe <axboe@kernel.dk>
Sat, 23 Jun 2018 16:25:45 +0000 (10:25 -0600)
commitf5e350f021e04ea41d2e5d58487c33b05ba3d25b
tree6cf89499e307b48964e4539842f502575617afe7
parent3ee7e8697d5860b173132606d80a9cd35e7113ee
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: da6612673988 ("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>
block/blk-mq.c
block/blk-timeout.c