diff options
author | Tejun Heo <tj@kernel.org> | 2013-08-08 20:11:23 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-08-08 20:11:23 -0400 |
commit | 6387698699afd72d6304566fb6ccf84bffe07c56 (patch) | |
tree | 9440e96fa8e5adce62409a5b0e40984dfedaada3 /kernel/cgroup_freezer.c | |
parent | a7c6d554aa01236ac2a9f851ab0f75704f76dfa2 (diff) |
cgroup: add css_parent()
Currently, controllers have to explicitly follow the cgroup hierarchy
to find the parent of a given css. cgroup is moving towards using
cgroup_subsys_state as the main controller interface construct, so
let's provide a way to climb the hierarchy using just csses.
This patch implements css_parent() which, given a css, returns its
parent. The function is guarnateed to valid non-NULL parent css as
long as the target css is not at the top of the hierarchy.
freezer, cpuset, cpu, cpuacct, hugetlb, memory, net_cls and devices
are converted to use css_parent() instead of accessing cgroup->parent
directly.
* __parent_ca() is dropped from cpuacct and its usage is replaced with
parent_ca(). The only difference between the two was NULL test on
cgroup->parent which is now embedded in css_parent() making the
distinction moot. Note that eventually a css->parent field will be
added to css and the NULL check in css_parent() will go away.
This patch shouldn't cause any behavior differences.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'kernel/cgroup_freezer.c')
-rw-r--r-- | kernel/cgroup_freezer.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c index 1db686e47a22..657a73cd44c4 100644 --- a/kernel/cgroup_freezer.c +++ b/kernel/cgroup_freezer.c | |||
@@ -62,11 +62,7 @@ static inline struct freezer *task_freezer(struct task_struct *task) | |||
62 | 62 | ||
63 | static struct freezer *parent_freezer(struct freezer *freezer) | 63 | static struct freezer *parent_freezer(struct freezer *freezer) |
64 | { | 64 | { |
65 | struct cgroup *pcg = freezer->css.cgroup->parent; | 65 | return css_freezer(css_parent(&freezer->css)); |
66 | |||
67 | if (pcg) | ||
68 | return cgroup_freezer(pcg); | ||
69 | return NULL; | ||
70 | } | 66 | } |
71 | 67 | ||
72 | bool cgroup_freezing(struct task_struct *task) | 68 | bool cgroup_freezing(struct task_struct *task) |
@@ -234,7 +230,7 @@ static void freezer_fork(struct task_struct *task) | |||
234 | * The root cgroup is non-freezable, so we can skip the | 230 | * The root cgroup is non-freezable, so we can skip the |
235 | * following check. | 231 | * following check. |
236 | */ | 232 | */ |
237 | if (!freezer->css.cgroup->parent) | 233 | if (!parent_freezer(freezer)) |
238 | goto out; | 234 | goto out; |
239 | 235 | ||
240 | spin_lock_irq(&freezer->lock); | 236 | spin_lock_irq(&freezer->lock); |