diff options
author | Tejun Heo <tj@kernel.org> | 2015-12-07 17:24:10 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-12-07 17:24:10 -0500 |
commit | 177493987c1a15145922a65240f2f8ab6c63770a (patch) | |
tree | 9b53320193b62cd405aeb20897ada2796bc32aa3 /include/linux/cgroup-defs.h | |
parent | e11362bb25d97ea1cbe9e3b1e5f3d32aa4e75e13 (diff) | |
parent | 16af439645455fbf36984ca5e72f31073ee19ab7 (diff) | |
download | linux-stable-177493987c1a15145922a65240f2f8ab6c63770a.tar.gz linux-stable-177493987c1a15145922a65240f2f8ab6c63770a.tar.bz2 linux-stable-177493987c1a15145922a65240f2f8ab6c63770a.zip |
Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-4.5
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/cgroup-defs.h')
-rw-r--r-- | include/linux/cgroup-defs.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 8cfbc9dfd650..7f334c2cbca9 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -225,6 +225,14 @@ struct cgroup { int id; /* + * The depth this cgroup is at. The root is at depth zero and each + * step down the hierarchy increments the level. This along with + * ancestor_ids[] can determine whether a given cgroup is a + * descendant of another without traversing the hierarchy. + */ + int level; + + /* * Each non-empty css_set associated with this cgroup contributes * one to populated_cnt. All children with non-zero popuplated_cnt * of their own contribute one. The count is zero iff there's no @@ -279,6 +287,9 @@ struct cgroup { /* used to schedule release agent */ struct work_struct release_agent_work; + + /* ids of the ancestors at each level including self */ + int ancestor_ids[]; }; /* @@ -298,6 +309,9 @@ struct cgroup_root { /* The root cgroup. Root is destroyed on its release. */ struct cgroup cgrp; + /* for cgrp->ancestor_ids[0] */ + int cgrp_ancestor_id_storage; + /* Number of cgroups in the hierarchy, used only for /proc/cgroups */ atomic_t nr_cgrps; |