Commit 2cdf2cae authored by Jens Axboe's avatar Jens Axboe

blk-cgroup: remove legacy queue bypassing

We only support mq devices now.
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3c774156
...@@ -1398,8 +1398,6 @@ int blkcg_activate_policy(struct request_queue *q, ...@@ -1398,8 +1398,6 @@ int blkcg_activate_policy(struct request_queue *q,
if (q->mq_ops) if (q->mq_ops)
blk_mq_freeze_queue(q); blk_mq_freeze_queue(q);
else
blk_queue_bypass_start(q);
pd_prealloc: pd_prealloc:
if (!pd_prealloc) { if (!pd_prealloc) {
pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node); pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node);
...@@ -1439,8 +1437,6 @@ int blkcg_activate_policy(struct request_queue *q, ...@@ -1439,8 +1437,6 @@ int blkcg_activate_policy(struct request_queue *q,
out_bypass_end: out_bypass_end:
if (q->mq_ops) if (q->mq_ops)
blk_mq_unfreeze_queue(q); blk_mq_unfreeze_queue(q);
else
blk_queue_bypass_end(q);
if (pd_prealloc) if (pd_prealloc)
pol->pd_free_fn(pd_prealloc); pol->pd_free_fn(pd_prealloc);
return ret; return ret;
...@@ -1465,8 +1461,6 @@ void blkcg_deactivate_policy(struct request_queue *q, ...@@ -1465,8 +1461,6 @@ void blkcg_deactivate_policy(struct request_queue *q,
if (q->mq_ops) if (q->mq_ops)
blk_mq_freeze_queue(q); blk_mq_freeze_queue(q);
else
blk_queue_bypass_start(q);
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
...@@ -1485,8 +1479,6 @@ void blkcg_deactivate_policy(struct request_queue *q, ...@@ -1485,8 +1479,6 @@ void blkcg_deactivate_policy(struct request_queue *q,
if (q->mq_ops) if (q->mq_ops)
blk_mq_unfreeze_queue(q); blk_mq_unfreeze_queue(q);
else
blk_queue_bypass_end(q);
} }
EXPORT_SYMBOL_GPL(blkcg_deactivate_policy); EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment