summaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-11-28 09:25:50 -0700
committerJens Axboe <axboe@fb.com>2016-11-28 10:27:03 -0700
commitfa224eed2b5e0f2f9a57281e9dc733c843d590ad (patch)
treee7cdf9a2458ec2fd000c536add5ac206ee1dd9f9 /block/cfq-iosched.c
parent80e091d10e8bf7b801d634ea8870b9e907314424 (diff)
downloadlinux-fa224eed2b5e0f2f9a57281e9dc733c843d590ad.tar.bz2
blk-wbt: cleanup disable-by-default for CFQ
Make it clear that we are disabling wbt for the specified queued, if it was enabled by default. This is in preparation for allowing users to re-enable wbt, and not have it disabled automatically again. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 9894dc985e09..c73a6fcaeb9d 100644
--- 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