diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-18 15:43:26 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-18 15:43:26 +0100 |
| commit | 4d199c6f1c847151ea393d5b9946a17cc57cdf6d (patch) | |
| tree | 7c8c4226a56f146c494c59936f67c0360a58a65c /block/blk-cgroup.c | |
| parent | blk-mq-sched: allow setting of default IO scheduler (diff) | |
| download | linux-4d199c6f1c847151ea393d5b9946a17cc57cdf6d.tar.xz linux-4d199c6f1c847151ea393d5b9946a17cc57cdf6d.zip | |
blk-cgroup: ensure that we clear the stop bit on quiesced queues
If we call blk_mq_quiesce_queue() on a queue, we must remember to
pair that with something that clears the stopped by on the
queues later on.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-cgroup.c')
| -rw-r--r-- | block/blk-cgroup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 2630f64bed19..efb97ec37eee 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1265,9 +1265,10 @@ pd_prealloc: spin_unlock_irq(q->queue_lock); out_bypass_end: - if (q->mq_ops) + if (q->mq_ops) { blk_mq_unfreeze_queue(q); - else + blk_mq_start_stopped_hw_queues(q, true); + } else blk_queue_bypass_end(q); if (pd_prealloc) pol->pd_free_fn(pd_prealloc); @@ -1317,9 +1318,10 @@ void blkcg_deactivate_policy(struct request_queue *q, spin_unlock_irq(q->queue_lock); - if (q->mq_ops) + if (q->mq_ops) { blk_mq_unfreeze_queue(q); - else + blk_mq_start_stopped_hw_queues(q, true); + } else blk_queue_bypass_end(q); } EXPORT_SYMBOL_GPL(blkcg_deactivate_policy); |