cgroup: pass around cgroup_subsys_state instead of cgroup in subsystem methods

[deliverable/linux.git] / kernel / sched / cpuacct.c

diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index f6926a149a71d40ed9d4f061f01c04766de3e5f9..1b784d9b363017cb5f336615f885ff275f01680b 100644 (file)
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -62,11 +62,12 @@ static struct cpuacct root_cpuacct = {
 };
 
 /* create a new cpu accounting group */
-static struct cgroup_subsys_state *cpuacct_css_alloc(struct cgroup *cgrp)
+static struct cgroup_subsys_state *
+cpuacct_css_alloc(struct cgroup_subsys_state *parent_css)
 {
        struct cpuacct *ca;
 
-       if (!cgrp->parent)
+       if (!parent_css)
                return &root_cpuacct.css;
 
        ca = kzalloc(sizeof(*ca), GFP_KERNEL);
@@ -92,9 +93,9 @@ out:
 }
 
 /* destroy an existing cpu accounting group */
-static void cpuacct_css_free(struct cgroup *cgrp)
+static void cpuacct_css_free(struct cgroup_subsys_state *css)
 {
-       struct cpuacct *ca = cgroup_ca(cgrp);
+       struct cpuacct *ca = css_ca(css);
 
        free_percpu(ca->cpustat);
        free_percpu(ca->cpuusage);