X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fblk-exec.c;h=a1ebceb332f963ee366aa7ebed60d69c4e1c11cb;hb=cfdf76474e1d8a56ac6cfae39f8559cfe9dfd7fd;hp=8a0e7ec056e7a3bd6db31f19ec72202ae97c581e;hpb=c01ad4081939f91ebd7277e8e731fd90ceb3e632;p=~andy%2Flinux

diff --git a/block/blk-exec.c b/block/blk-exec.c
index 8a0e7ec056e..a1ebceb332f 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 {
 	int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
 
+	if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
+		rq->errors = -ENXIO;
+		if (rq->end_io)
+			rq->end_io(rq, rq->errors);
+		return;
+	}
+
 	rq->rq_disk = bd_disk;
 	rq->end_io = done;
 	WARN_ON(irqs_disabled());