Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index 8a0e7ec056e7a3bd6db31f19ec72202ae97c581e..fb2cbd551621d3f23be57210534ed98417d01489 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -50,10 +50,19 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 {
        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
 
-       rq->rq_disk = bd_disk;
-       rq->end_io = done;
        WARN_ON(irqs_disabled());
        spin_lock_irq(q->queue_lock);
+
+       if (unlikely(blk_queue_dead(q))) {
+               spin_unlock_irq(q->queue_lock);
+               rq->errors = -ENXIO;
+               if (rq->end_io)
+                       rq->end_io(rq, rq->errors);
+               return;
+       }
+
+       rq->rq_disk = bd_disk;
+       rq->end_io = done;
        __elv_add_request(q, rq, where);
        __blk_run_queue(q);
        /* the queue is stopped so it won't be run */