Merge branch 'for-4.3-unified-base' into for-4.3

1 files changed, 26 insertions, 15 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 97e2da0d3b27..4ec1b7ee5de8 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -145,6 +145,7 @@ static const char *cgroup_subsys_name[] = {
  * part of that cgroup.
  */
 struct cgroup_root cgrp_dfl_root;
+EXPORT_SYMBOL_GPL(cgrp_dfl_root);
 
 /*
  * The default hierarchy always exists but is hidden until mounted for the
@@ -1030,10 +1031,13 @@ static const struct file_operations proc_cgroupstats_operations;
 static char *cgroup_file_name(struct cgroup *cgrp, const struct cftype *cft,
                               char *buf)
 {
+        struct cgroup_subsys *ss = cft->ss;
+
         if (cft->ss && !(cft->flags & CFTYPE_NO_PREFIX) &&
             !(cgrp->root->flags & CGRP_ROOT_NOPREFIX))
                 snprintf(buf, CGROUP_FILE_NAME_MAX, "%s.%s",
-                         cft->ss->name, cft->name);
+                         cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
+                         cft->name);
         else
                 strncpy(buf, cft->name, CGROUP_FILE_NAME_MAX);
         return buf;
@@ -1335,9 +1339,10 @@ static int cgroup_show_options(struct seq_file *seq,
         struct cgroup_subsys *ss;
         int ssid;
 
-        for_each_subsys(ss, ssid)
-                if (root->subsys_mask & (1 << ssid))
-                        seq_printf(seq, ",%s", ss->name);
+        if (root != &cgrp_dfl_root)
+                for_each_subsys(ss, ssid)
+                        if (root->subsys_mask & (1 << ssid))
+                                seq_printf(seq, ",%s", ss->legacy_name);
         if (root->flags & CGRP_ROOT_NOPREFIX)
                 seq_puts(seq, ",noprefix");
         if (root->flags & CGRP_ROOT_XATTR)
@@ -1450,7 +1455,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
                 }
 
                 for_each_subsys(ss, i) {
-                        if (strcmp(token, ss->name))
+                        if (strcmp(token, ss->legacy_name))
                                 continue;
                         if (ss->disabled)
                                 continue;
@@ -4997,6 +5002,8 @@ int __init cgroup_init_early(void)
 
                 ss->id = i;
                 ss->name = cgroup_subsys_name[i];
+                if (!ss->legacy_name)
+                        ss->legacy_name = cgroup_subsys_name[i];
 
                 if (ss->early_init)
                         cgroup_init_subsys(ss, true);
@@ -5140,9 +5147,11 @@ int proc_cgroup_show(struct seq_file *m, struct pid_namespace *ns,
                         continue;
 
                 seq_printf(m, "%d:", root->hierarchy_id);
-                for_each_subsys(ss, ssid)
-                        if (root->subsys_mask & (1 << ssid))
-                                seq_printf(m, "%s%s", count++ ? "," : "", ss->name);
+                if (root != &cgrp_dfl_root)
+                        for_each_subsys(ss, ssid)
+                                if (root->subsys_mask & (1 << ssid))
+                                        seq_printf(m, "%s%s", count++ ? "," : "",
+                                                   ss->legacy_name);
                 if (strlen(root->name))
                         seq_printf(m, "%sname=%s", count ? "," : "",
                                    root->name);
@@ -5182,7 +5191,7 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v)
 
         for_each_subsys(ss, i)
                 seq_printf(m, "%s\t%d\t%d\t%d\n",
-                           ss->name, ss->root->hierarchy_id,
+                           ss->legacy_name, ss->root->hierarchy_id,
                            atomic_read(&ss->root->nr_cgrps), !ss->disabled);
 
         mutex_unlock(&cgroup_mutex);
@@ -5469,12 +5478,14 @@ static int __init cgroup_disable(char *str)
                         continue;
 
                 for_each_subsys(ss, i) {
-                        if (!strcmp(token, ss->name)) {
-                                ss->disabled = 1;
-                                printk(KERN_INFO "Disabling %s control group"
-                                        " subsystem\n", ss->name);
-                                break;
-                        }
+                        if (strcmp(token, ss->name) &&
+                            strcmp(token, ss->legacy_name))
+                                continue;
+
+                        ss->disabled = 1;
+                        printk(KERN_INFO "Disabling %s control group subsystem\n",
+                               ss->name);
+                        break;
                 }
         }
         return 1;