Commit a59e0f57 authored Feb 11, 2016 by Keith Busch Committed by Jens Axboe Feb 11, 2016

blk-mq: End unstarted requests on dying queue



Go directly to ending a request if it wasn't started. Previously, completing a
request may invoke a driver callback for a request it didn't initialize.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 5f009d3f

block/blk-mq.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -599,8 +599,10 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx,
		* 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)))
		blk_mq_complete_request(rq, -EIO);
		if (unlikely(blk_queue_dying(rq->q))) {
		rq->errors = -EIO;
		blk_mq_end_request(rq, rq->errors);
		}
		return;
		}