2 files changed, 14 insertions, 5 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 28d227c5ca77..e17da947f6bd 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -928,7 +928,15 @@ struct cgroup_subsys blkio_cgrp_subsys = {
         .css_offline = blkcg_css_offline,
         .css_free = blkcg_css_free,
         .can_attach = blkcg_can_attach,
-        .base_cftypes = blkcg_files,
+        .legacy_cftypes = blkcg_files,
+#ifdef CONFIG_MEMCG
+        /*
+         * This ensures that, if available, memcg is automatically enabled
+         * together on the default hierarchy so that the owner cgroup can
+         * be retrieved from writeback pages.
+         */
+        .depends_on = 1 << memory_cgrp_id,
+#endif
 };
 EXPORT_SYMBOL_GPL(blkio_cgrp_subsys);
 
@@ -1120,7 +1128,8 @@ int blkcg_policy_register(struct blkcg_policy *pol)
 
         /* everything is in place, add intf files for the new policy */
         if (pol->cftypes)
-                WARN_ON(cgroup_add_cftypes(&blkio_cgrp_subsys, pol->cftypes));
+                WARN_ON(cgroup_add_legacy_cftypes(&blkio_cgrp_subsys,
+                                                  pol->cftypes));
         ret = 0;
 out_unlock:
         mutex_unlock(&blkcg_pol_mutex);
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 3fdb21a390c1..9273d0969ebd 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -412,13 +412,13 @@ static void throtl_pd_init(struct blkcg_gq *blkg)
         int rw;
 
         /*
-         * If sane_hierarchy is enabled, we switch to properly hierarchical
+         * If on the default hierarchy, we switch to properly hierarchical
          * behavior where limits on a given throtl_grp are applied to the
          * whole subtree rather than just the group itself.  e.g. If 16M
          * read_bps limit is set on the root group, the whole system can't
          * exceed 16M for the device.
          *
-         * If sane_hierarchy is not enabled, the broken flat hierarchy
+         * If not on the default hierarchy, the broken flat hierarchy
          * behavior is retained where all throtl_grps are treated as if
          * they're all separate root groups right below throtl_data.
          * Limits of a group don't interact with limits of other groups
@@ -426,7 +426,7 @@ static void throtl_pd_init(struct blkcg_gq *blkg)
          */
         parent_sq = &td->service_queue;
 
-        if (cgroup_sane_behavior(blkg->blkcg->css.cgroup) && blkg->parent)
+        if (cgroup_on_dfl(blkg->blkcg->css.cgroup) && blkg->parent)
                 parent_sq = &blkg_to_tg(blkg->parent)->service_queue;
 
         throtl_service_queue_init(&tg->service_queue, parent_sq);