Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5577964e authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-by: default avatarLi 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>
parent a14c6874

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ struct cgroup_subsys blkio_cgrp_subsys = { 
	.css_offline = blkcg_css_offline,

	.css_free = blkcg_css_free,

	.can_attach = blkcg_can_attach,

	.base_cftypes = blkcg_files,

	.legacy_cftypes = blkcg_files,

#ifdef CONFIG_MEMCG

	/*

	 * This ensures that, if available, memcg is automatically enabled

include/linux/cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ struct cgroup_subsys { 
	struct list_head cfts;



	/* 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

kernel/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -4890,7 +4890,7 @@ int __init cgroup_init(void) 
		 */

		if (!ss->disabled) {

			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 = {

	.css_alloc = debug_css_alloc,

	.css_free = debug_css_free,

	.base_cftypes = debug_files,

	.legacy_cftypes = debug_files,

};

#endif /* CONFIG_CGROUP_DEBUG */

kernel/cgroup_freezer.c

+1 −1
Original line number Diff line number Diff line
@@ -480,5 +480,5 @@ struct cgroup_subsys freezer_cgrp_subsys = { 
	.css_free	= freezer_css_free,

	.attach		= freezer_attach,

	.fork		= freezer_fork,

	.base_cftypes	= files,

	.legacy_cftypes	= files,

};

kernel/cpuset.c

+1 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = { 
	.cancel_attach	= cpuset_cancel_attach,

	.attach		= cpuset_attach,

	.bind		= cpuset_bind,

	.base_cftypes	= files,

	.legacy_cftypes	= files,

	.early_init	= 1,

};