aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/cgroup.h9
-rw-r--r--kernel/cgroup.c1
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 552c5feef733..821678aae4db 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -66,13 +66,12 @@ enum cgroup_subsys_id {
66 66
67/* Per-subsystem/per-cgroup state maintained by the system. */ 67/* Per-subsystem/per-cgroup state maintained by the system. */
68struct cgroup_subsys_state { 68struct cgroup_subsys_state {
69 /* 69 /* the cgroup that this css is attached to */
70 * The cgroup that this subsystem is attached to. Useful
71 * for subsystems that want to know about the cgroup
72 * hierarchy structure
73 */
74 struct cgroup *cgroup; 70 struct cgroup *cgroup;
75 71
72 /* the cgroup subsystem that this css is attached to */
73 struct cgroup_subsys *ss;
74
76 /* reference count - access via css_[try]get() and css_put() */ 75 /* reference count - access via css_[try]get() and css_put() */
77 struct percpu_ref refcnt; 76 struct percpu_ref refcnt;
78 77
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 0b3caa3220cb..4234428f1014 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4186,6 +4186,7 @@ static void init_cgroup_css(struct cgroup_subsys_state *css,
4186 struct cgroup *cgrp) 4186 struct cgroup *cgrp)
4187{ 4187{
4188 css->cgroup = cgrp; 4188 css->cgroup = cgrp;
4189 css->ss = ss;
4189 css->flags = 0; 4190 css->flags = 0;
4190 css->id = NULL; 4191 css->id = NULL;
4191 if (cgrp == cgroup_dummy_top) 4192 if (cgrp == cgroup_dummy_top)