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 /mm/hugetlb_cgroup.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 'mm/hugetlb_cgroup.c')
-rw-r--r-- | mm/hugetlb_cgroup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 95585a0b9c8d..57ecb5d2513f 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c | |||
@@ -59,11 +59,7 @@ static inline bool hugetlb_cgroup_is_root(struct hugetlb_cgroup *h_cg) | |||
59 | static inline struct hugetlb_cgroup * | 59 | static inline struct hugetlb_cgroup * |
60 | parent_hugetlb_cgroup(struct hugetlb_cgroup *h_cg) | 60 | parent_hugetlb_cgroup(struct hugetlb_cgroup *h_cg) |
61 | { | 61 | { |
62 | struct cgroup *parent = h_cg->css.cgroup->parent; | 62 | return hugetlb_cgroup_from_css(css_parent(&h_cg->css)); |
63 | |||
64 | if (!parent) | ||
65 | return NULL; | ||
66 | return hugetlb_cgroup_from_cgroup(parent); | ||
67 | } | 63 | } |
68 | 64 | ||
69 | static inline bool hugetlb_cgroup_have_usage(struct hugetlb_cgroup *h_cg) | 65 | static inline bool hugetlb_cgroup_have_usage(struct hugetlb_cgroup *h_cg) |