From: Mike Christie <michaelc@cs.wisc.edu>
Date: Wed, 18 Sep 2013 14:33:55 +0000 (-0600)
Subject: If the queue is dying then we only call the rq->end_io callout.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7652113c2f508b1c8176640dcd034730fe79bc48;p=linux.git

If the queue is dying then we only call the rq->end_io callout.
This leaves bios setup on the request, because the caller assumes when
the blk_execute_rq_nowait/blk_execute_rq call has completed that
the rq->bios have been cleaned up.

This patch has blk_execute_rq_nowait use __blk_end_request_all
to free bios and also call rq->end_io.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-exec.c b/block/blk-exec.c
index e706213961291..ae4f27d7944e9 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -68,9 +68,9 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 	spin_lock_irq(q->queue_lock);
 
 	if (unlikely(blk_queue_dying(q))) {
+		rq->cmd_flags |= REQ_QUIET; 
 		rq->errors = -ENXIO;
-		if (rq->end_io)
-			rq->end_io(rq, rq->errors);
+		__blk_end_request_all(rq, rq->errors);
 		spin_unlock_irq(q->queue_lock);
 		return;
 	}