Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb130dbf authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

blk-mq: End unstarted requests on a dying queue 



Requests that haven't been started prior to a queue dying can be ended
in error without waiting for them to start and time out.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>

Added code comment to explain why this is done.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 5b3f25fc

block/blk-mq.c

+10 −1
Original line number Diff line number Diff line
@@ -625,8 +625,17 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, 
{

	struct blk_mq_timeout_data *data = priv;



	if (!test_bit(REQ_ATOM_STARTED, &rq->atomic_flags))

	if (!test_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) {

		/*

		 * If a request wasn't started before the queue was

		 * marked dying, kill it here or it'll go unnoticed.

		 */

		if (unlikely(blk_queue_dying(rq->q))) {

			rq->errors = -EIO;

			blk_mq_complete_request(rq);

		}

		return;

	}

	if (rq->cmd_flags & REQ_NO_TIMEOUT)

		return;