summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-02-01 15:31:30 -0700
committerJens Axboe <axboe@fb.com>2017-02-01 15:31:30 -0700
commit3020829168bdaa2c36af445e38f7eef06c524a03 (patch)
tree1d4012567d7d6185ff95a1e326ae17eadbbfe0e2 /block
parentd2c36dad5c0515f2dcfe24c7613fe241562138c8 (diff)
parentbbfc3c5d6c7882dc65c1230e781644e35c29839f (diff)
Merge branch 'for-4.11/block' into for-next
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 3266daaa343f..c142de090c41 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -516,12 +516,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);