aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/cgroup-defs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-02-22 22:25:46 -0500
committerTejun Heo <tj@kernel.org>2016-02-22 22:25:46 -0500
commit8699b7762a623c46ced891b3cf490058b56cf99c (patch)
treea43d89150fb3ec560bd436a941d74aa07a745e4e /include/linux/cgroup-defs.h
parentRevert "cgroup: add cgroup_subsys->css_e_css_changed()" (diff)
downloadlinux-dev-8699b7762a623c46ced891b3cf490058b56cf99c.tar.xz
linux-dev-8699b7762a623c46ced891b3cf490058b56cf99c.zip
cgroup: s/child_subsys_mask/subtree_ss_mask/
For consistency with cgroup->subtree_control. * cgroup->child_subsys_mask -> cgroup->subtree_ss_mask * cgroup_calc_child_subsys_mask() -> cgroup_calc_subtree_ss_mask() * cgroup_refresh_child_subsys_mask() -> cgroup_refresh_subtree_ss_mask() No functional changes. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Diffstat (limited to 'include/linux/cgroup-defs.h')
-rw-r--r--include/linux/cgroup-defs.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 4f3c0dac26b5..c68ae7f0fb5f 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -253,13 +253,12 @@ struct cgroup {
/*
* The bitmask of subsystems enabled on the child cgroups.
* ->subtree_control is the one configured through
- * "cgroup.subtree_control" while ->child_subsys_mask is the
- * effective one which may have more subsystems enabled.
- * Controller knobs are made available iff it's enabled in
- * ->subtree_control.
+ * "cgroup.subtree_control" while ->child_ss_mask is the effective
+ * one which may have more subsystems enabled. Controller knobs
+ * are made available iff it's enabled in ->subtree_control.
*/
- unsigned int subtree_control;
- unsigned int child_subsys_mask;
+ unsigned long subtree_control;
+ unsigned long subtree_ss_mask;
/* Private pointers for each registered subsystem */
struct cgroup_subsys_state __rcu *subsys[CGROUP_SUBSYS_COUNT];