Merge tag 'sound-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[mirror_ubuntu-bionic-kernel.git] / block / blk-throttle.c

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index c75a2636dd404840ea13000ea5747e0d44ddd7be..2149a1ddbacf21a02a164b042c76e06bf6734c77 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -369,7 +369,7 @@ static void throtl_pd_init(struct blkg_policy_data *pd)
         * regardless of the position of the group in the hierarchy.
         */
        sq->parent_sq = &td->service_queue;
-       if (cgroup_on_dfl(blkg->blkcg->css.cgroup) && blkg->parent)
+       if (cgroup_subsys_on_dfl(io_cgrp_subsys) && blkg->parent)
                sq->parent_sq = &blkg_to_tg(blkg->parent)->service_queue;
        tg->td = td;
 }