Merge branch 'for-4.11/next' into for-4.11/linus-merge

[karo-tx-linux.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index c0e4d41d3d3336d8a40c8d5fdd29325b0fce9fe2..b9e857f4afe85fcc1b19d00064e62e743c1c977f 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -505,12 +505,14 @@ void blk_set_queue_dying(struct request_queue *q)
        else {
                struct request_list *rl;
 
+               spin_lock_irq(q->queue_lock);
                blk_queue_for_each_rl(rl, q) {
                        if (rl->rq_pool) {
                                wake_up(&rl->wait[BLK_RW_SYNC]);
                                wake_up(&rl->wait[BLK_RW_ASYNC]);
                        }
                }
+               spin_unlock_irq(q->queue_lock);
        }
 }
 EXPORT_SYMBOL_GPL(blk_set_queue_dying);