aboutsummaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 04de88463a98..1f9093e901da 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1581,7 +1581,7 @@ static struct blkcg_policy_data *cfq_cpd_alloc(gfp_t gfp)
1581static void cfq_cpd_init(struct blkcg_policy_data *cpd) 1581static void cfq_cpd_init(struct blkcg_policy_data *cpd)
1582{ 1582{
1583 struct cfq_group_data *cgd = cpd_to_cfqgd(cpd); 1583 struct cfq_group_data *cgd = cpd_to_cfqgd(cpd);
1584 unsigned int weight = cgroup_on_dfl(blkcg_root.css.cgroup) ? 1584 unsigned int weight = cgroup_subsys_on_dfl(io_cgrp_subsys) ?
1585 CGROUP_WEIGHT_DFL : CFQ_WEIGHT_LEGACY_DFL; 1585 CGROUP_WEIGHT_DFL : CFQ_WEIGHT_LEGACY_DFL;
1586 1586
1587 if (cpd_to_blkcg(cpd) == &blkcg_root) 1587 if (cpd_to_blkcg(cpd) == &blkcg_root)
@@ -1599,7 +1599,7 @@ static void cfq_cpd_free(struct blkcg_policy_data *cpd)
1599static void cfq_cpd_bind(struct blkcg_policy_data *cpd) 1599static void cfq_cpd_bind(struct blkcg_policy_data *cpd)
1600{ 1600{
1601 struct blkcg *blkcg = cpd_to_blkcg(cpd); 1601 struct blkcg *blkcg = cpd_to_blkcg(cpd);
1602 bool on_dfl = cgroup_on_dfl(blkcg_root.css.cgroup); 1602 bool on_dfl = cgroup_subsys_on_dfl(io_cgrp_subsys);
1603 unsigned int weight = on_dfl ? CGROUP_WEIGHT_DFL : CFQ_WEIGHT_LEGACY_DFL; 1603 unsigned int weight = on_dfl ? CGROUP_WEIGHT_DFL : CFQ_WEIGHT_LEGACY_DFL;
1604 1604
1605 if (blkcg == &blkcg_root) 1605 if (blkcg == &blkcg_root)