[PATCH 16/28] blk-cgroup: remove legacy queue bypassing

[Jens Axboe]

We only support mq devices now.

Signed-off-by: Jens Axboe <ax...@kernel.dk>
---
 block/blk-cgroup.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 992da5592c6e..5f10d755ec52 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1446,8 +1446,6 @@ int blkcg_activate_policy(struct request_queue *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);
@@ -1487,8 +1485,6 @@ int blkcg_activate_policy(struct request_queue *q,
 out_bypass_end:
        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;
@@ -1513,8 +1509,6 @@ void blkcg_deactivate_policy(struct request_queue *q,
 
        if (q->mq_ops)
                blk_mq_freeze_queue(q);
-       else
-               blk_queue_bypass_start(q);
 
        spin_lock_irq(q->queue_lock);
 
@@ -1533,8 +1527,6 @@ void blkcg_deactivate_policy(struct request_queue *q,
 
        if (q->mq_ops)
                blk_mq_unfreeze_queue(q);
-       else
-               blk_queue_bypass_end(q);
 }
 EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);
 
-- 
2.17.1