cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
Currently, cgroup_subsys->base_cftypes is used for both the unified default hierarchy and legacy ones and subsystems can mark each file with either CFTYPE_ONLY_ON_DFL or CFTYPE_INSANE if it has to appear only on one of them. This is quite hairy and error-prone. Also, we may end up exposing interface files to the default hierarchy without thinking it through. cgroup_subsys will grow two separate cftype arrays and apply each only on the hierarchies of the matching type. This will allow organizing cftypes in a lot clearer way and encourage subsystems to scrutinize the interface which is being exposed in the new default hierarchy. In preparation, this patch renames cgroup_subsys->base_cftypes to cgroup_subsys->legacy_cftypes. This patch is pure rename. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Li Zefan <lizefan@huawei.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Aristeu Rozanski <aris@redhat.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
parent
a14c6874be
commit
5577964e64
|
@ -924,7 +924,7 @@ struct cgroup_subsys blkio_cgrp_subsys = {
|
||||||
.css_offline = blkcg_css_offline,
|
.css_offline = blkcg_css_offline,
|
||||||
.css_free = blkcg_css_free,
|
.css_free = blkcg_css_free,
|
||||||
.can_attach = blkcg_can_attach,
|
.can_attach = blkcg_can_attach,
|
||||||
.base_cftypes = blkcg_files,
|
.legacy_cftypes = blkcg_files,
|
||||||
#ifdef CONFIG_MEMCG
|
#ifdef CONFIG_MEMCG
|
||||||
/*
|
/*
|
||||||
* This ensures that, if available, memcg is automatically enabled
|
* This ensures that, if available, memcg is automatically enabled
|
||||||
|
|
|
@ -672,7 +672,7 @@ struct cgroup_subsys {
|
||||||
struct list_head cfts;
|
struct list_head cfts;
|
||||||
|
|
||||||
/* base cftypes, automatically registered with subsys itself */
|
/* base cftypes, automatically registered with subsys itself */
|
||||||
struct cftype *base_cftypes;
|
struct cftype *legacy_cftypes; /* used on the legacy hierarchies */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* A subsystem may depend on other subsystems. When such subsystem
|
* A subsystem may depend on other subsystems. When such subsystem
|
||||||
|
|
|
@ -4890,7 +4890,7 @@ int __init cgroup_init(void)
|
||||||
*/
|
*/
|
||||||
if (!ss->disabled) {
|
if (!ss->disabled) {
|
||||||
cgrp_dfl_root.subsys_mask |= 1 << ss->id;
|
cgrp_dfl_root.subsys_mask |= 1 << ss->id;
|
||||||
WARN_ON(cgroup_add_cftypes(ss, ss->base_cftypes));
|
WARN_ON(cgroup_add_cftypes(ss, ss->legacy_cftypes));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5480,6 +5480,6 @@ static struct cftype debug_files[] = {
|
||||||
struct cgroup_subsys debug_cgrp_subsys = {
|
struct cgroup_subsys debug_cgrp_subsys = {
|
||||||
.css_alloc = debug_css_alloc,
|
.css_alloc = debug_css_alloc,
|
||||||
.css_free = debug_css_free,
|
.css_free = debug_css_free,
|
||||||
.base_cftypes = debug_files,
|
.legacy_cftypes = debug_files,
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_CGROUP_DEBUG */
|
#endif /* CONFIG_CGROUP_DEBUG */
|
||||||
|
|
|
@ -480,5 +480,5 @@ struct cgroup_subsys freezer_cgrp_subsys = {
|
||||||
.css_free = freezer_css_free,
|
.css_free = freezer_css_free,
|
||||||
.attach = freezer_attach,
|
.attach = freezer_attach,
|
||||||
.fork = freezer_fork,
|
.fork = freezer_fork,
|
||||||
.base_cftypes = files,
|
.legacy_cftypes = files,
|
||||||
};
|
};
|
||||||
|
|
|
@ -2036,7 +2036,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = {
|
||||||
.cancel_attach = cpuset_cancel_attach,
|
.cancel_attach = cpuset_cancel_attach,
|
||||||
.attach = cpuset_attach,
|
.attach = cpuset_attach,
|
||||||
.bind = cpuset_bind,
|
.bind = cpuset_bind,
|
||||||
.base_cftypes = files,
|
.legacy_cftypes = files,
|
||||||
.early_init = 1,
|
.early_init = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -8088,7 +8088,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
|
||||||
.can_attach = cpu_cgroup_can_attach,
|
.can_attach = cpu_cgroup_can_attach,
|
||||||
.attach = cpu_cgroup_attach,
|
.attach = cpu_cgroup_attach,
|
||||||
.exit = cpu_cgroup_exit,
|
.exit = cpu_cgroup_exit,
|
||||||
.base_cftypes = cpu_files,
|
.legacy_cftypes = cpu_files,
|
||||||
.early_init = 1,
|
.early_init = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -278,6 +278,6 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val)
|
||||||
struct cgroup_subsys cpuacct_cgrp_subsys = {
|
struct cgroup_subsys cpuacct_cgrp_subsys = {
|
||||||
.css_alloc = cpuacct_css_alloc,
|
.css_alloc = cpuacct_css_alloc,
|
||||||
.css_free = cpuacct_css_free,
|
.css_free = cpuacct_css_free,
|
||||||
.base_cftypes = files,
|
.legacy_cftypes = files,
|
||||||
.early_init = 1,
|
.early_init = 1,
|
||||||
};
|
};
|
||||||
|
|
|
@ -7048,7 +7048,7 @@ struct cgroup_subsys memory_cgrp_subsys = {
|
||||||
.cancel_attach = mem_cgroup_cancel_attach,
|
.cancel_attach = mem_cgroup_cancel_attach,
|
||||||
.attach = mem_cgroup_move_task,
|
.attach = mem_cgroup_move_task,
|
||||||
.bind = mem_cgroup_bind,
|
.bind = mem_cgroup_bind,
|
||||||
.base_cftypes = mem_cgroup_files,
|
.legacy_cftypes = mem_cgroup_files,
|
||||||
.early_init = 0,
|
.early_init = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -107,5 +107,5 @@ struct cgroup_subsys net_cls_cgrp_subsys = {
|
||||||
.css_online = cgrp_css_online,
|
.css_online = cgrp_css_online,
|
||||||
.css_free = cgrp_css_free,
|
.css_free = cgrp_css_free,
|
||||||
.attach = cgrp_attach,
|
.attach = cgrp_attach,
|
||||||
.base_cftypes = ss_files,
|
.legacy_cftypes = ss_files,
|
||||||
};
|
};
|
||||||
|
|
|
@ -249,7 +249,7 @@ struct cgroup_subsys net_prio_cgrp_subsys = {
|
||||||
.css_online = cgrp_css_online,
|
.css_online = cgrp_css_online,
|
||||||
.css_free = cgrp_css_free,
|
.css_free = cgrp_css_free,
|
||||||
.attach = net_prio_attach,
|
.attach = net_prio_attach,
|
||||||
.base_cftypes = ss_files,
|
.legacy_cftypes = ss_files,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int netprio_device_event(struct notifier_block *unused,
|
static int netprio_device_event(struct notifier_block *unused,
|
||||||
|
|
|
@ -796,7 +796,7 @@ struct cgroup_subsys devices_cgrp_subsys = {
|
||||||
.css_free = devcgroup_css_free,
|
.css_free = devcgroup_css_free,
|
||||||
.css_online = devcgroup_online,
|
.css_online = devcgroup_online,
|
||||||
.css_offline = devcgroup_offline,
|
.css_offline = devcgroup_offline,
|
||||||
.base_cftypes = dev_cgroup_files,
|
.legacy_cftypes = dev_cgroup_files,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue