cgroup: clean up cgroup_subsys names and initialization

[deliverable/linux.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 4410ac6a55f1d9ae410976e3a8e7315acf88a61b..2d018c795fea0bae4c7ddf4a03dee05303eb15b7 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -119,7 +119,7 @@ static inline struct cpuset *css_cs(struct cgroup_subsys_state *css)
 /* Retrieve the cpuset for a task */
 static inline struct cpuset *task_cs(struct task_struct *task)
 {
-       return css_cs(task_css(task, cpuset_subsys_id));
+       return css_cs(task_css(task, cpuset_cgrp_id));
 }
 
 static inline struct cpuset *parent_cs(struct cpuset *cs)
@@ -1521,7 +1521,7 @@ static void cpuset_attach(struct cgroup_subsys_state *css,
        struct task_struct *task;
        struct task_struct *leader = cgroup_taskset_first(tset);
        struct cgroup_subsys_state *oldcss = cgroup_taskset_cur_css(tset,
-                                                       cpuset_subsys_id);
+                                                       cpuset_cgrp_id);
        struct cpuset *cs = css_cs(css);
        struct cpuset *oldcs = css_cs(oldcss);
        struct cpuset *cpus_cs = effective_cpumask_cpuset(cs);
@@ -2024,8 +2024,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
        kfree(cs);
 }
 
-struct cgroup_subsys cpuset_subsys = {
-       .name = "cpuset",
+struct cgroup_subsys cpuset_cgrp_subsys = {
        .css_alloc = cpuset_css_alloc,
        .css_online = cpuset_css_online,
        .css_offline = cpuset_css_offline,
@@ -2033,7 +2032,6 @@ struct cgroup_subsys cpuset_subsys = {
        .can_attach = cpuset_can_attach,
        .cancel_attach = cpuset_cancel_attach,
        .attach = cpuset_attach,
-       .subsys_id = cpuset_subsys_id,
        .base_cftypes = files,
        .early_init = 1,
 };
@@ -2699,7 +2697,7 @@ int proc_cpuset_show(struct seq_file *m, void *unused_v)
                goto out_free;
 
        rcu_read_lock();
-       css = task_css(tsk, cpuset_subsys_id);
+       css = task_css(tsk, cpuset_cgrp_id);
        retval = cgroup_path(css->cgroup, buf, PAGE_SIZE);
        rcu_read_unlock();
        if (retval < 0)