1 files changed, 5 insertions, 3 deletions

diff --git a/block/blk-exec.c b/block/blk-exec.c
index a1ebceb332f9..fb2cbd551621 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -50,7 +50,11 @@ 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))) {
+        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);
@@ -59,8 +63,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 
         rq->rq_disk = bd_disk;
         rq->end_io = done;
-        WARN_ON(irqs_disabled());
-        spin_lock_irq(q->queue_lock);
         __elv_add_request(q, rq, where);
         __blk_run_queue(q);
         /* the queue is stopped so it won't be run */