blk-wbt: cleanup disable-by-default for CFQ

[mirror_ubuntu-bionic-kernel.git] / block / cfq-iosched.c

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 9894dc985e09350354f9a932f37f0afa55de2baa..c73a6fcaeb9d52c7e2aa1ebbcf725e86cdc707f4 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3780,13 +3780,10 @@ static void check_blkcg_changed(struct cfq_io_cq *cic, struct bio *bio)
        /*
         * If we have a non-root cgroup, we can depend on that to
         * do proper throttling of writes. Turn off wbt for that
-        * case.
+        * case, if it was enabled by default.
         */
-       if (nonroot_cg) {
-               struct request_queue *q = cfqd->queue;
-
-               wbt_disable(q->rq_wb);
-       }
+       if (nonroot_cg)
+               wbt_disable_default(cfqd->queue);
 
        /*
         * Drop reference to queues.  New queues will be assigned in new