1 files changed, 11 insertions, 2 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);