diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-27 15:08:31 -0700 |
| commit | f924ba70c1b12706c6679d793202e8f4c125f7ae (patch) | |
| tree | 978f8f56ccfa7c6fdb4be4ac6e498d73d44bf14f /block/blk-cgroup.c | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| parent | 400f73b23f457a82288814e21af57dbc9f3f2afd (diff) | |
| download | op-kernel-dev-f924ba70c1b12706c6679d793202e8f4c125f7ae.zip op-kernel-dev-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.gz | |
Merge branch 'for-4.11/block' into for-4.11/rq-refactor
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-cgroup.c')
| -rw-r--r-- | block/blk-cgroup.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 8ba0af7..fb59a3e 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1223,7 +1223,10 @@ int blkcg_activate_policy(struct request_queue *q, if (blkcg_policy_enabled(q, pol)) return 0; - blk_queue_bypass_start(q); + if (q->mq_ops) + blk_mq_freeze_queue(q); + else + blk_queue_bypass_start(q); pd_prealloc: if (!pd_prealloc) { pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node); @@ -1261,7 +1264,10 @@ pd_prealloc: spin_unlock_irq(q->queue_lock); out_bypass_end: - blk_queue_bypass_end(q); + if (q->mq_ops) + blk_mq_unfreeze_queue(q); + else + blk_queue_bypass_end(q); if (pd_prealloc) pol->pd_free_fn(pd_prealloc); return ret; @@ -1284,7 +1290,11 @@ void blkcg_deactivate_policy(struct request_queue *q, if (!blkcg_policy_enabled(q, pol)) return; - blk_queue_bypass_start(q); + if (q->mq_ops) + blk_mq_freeze_queue(q); + else + blk_queue_bypass_start(q); + spin_lock_irq(q->queue_lock); __clear_bit(pol->plid, q->blkcg_pols); @@ -1304,7 +1314,11 @@ void blkcg_deactivate_policy(struct request_queue *q, } spin_unlock_irq(q->queue_lock); - blk_queue_bypass_end(q); + + if (q->mq_ops) + blk_mq_unfreeze_queue(q); + else + blk_queue_bypass_end(q); } EXPORT_SYMBOL_GPL(blkcg_deactivate_policy); |
