diff options
author | David S. Miller <davem@davemloft.net> | 2015-12-08 22:01:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-08 22:01:38 -0500 |
commit | bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9 (patch) | |
tree | 60407a8c19e907a91c736fb95f1a30186a7542d5 /include/linux/cgroup-defs.h | |
parent | Revert "Merge branch 'vsock-virtio'" (diff) | |
parent | cgroup: implement cgroup_get_from_path() and expose cgroup_put() (diff) | |
download | linux-dev-bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9.tar.xz linux-dev-bc9b145a092aca91a7f6ef40cdb3628b6ada7ec9.zip |
Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Preparatory changes for some new socket cgroup infrastructure
and netfilter targets.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 60d44b26276d..504d8591b6d3 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -235,6 +235,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 @@ -289,6 +297,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[]; }; /* @@ -308,6 +319,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; |