Commit 659f90f8 authored by Michal Koutný's avatar Michal Koutný Committed by Tejun Heo
Browse files

cgroup/cpuset: Expose cpuset filesystem with cpuset v1 only 



The cpuset filesystem is a legacy interface to cpuset controller with
(pre-)v1 features. It makes little sense to co-mount it on systems
without cpuset v1, so do not build it when cpuset v1 is not built
neither.

Signed-off-by: default avatarMichal Koutný <mkoutny@suse.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8c7e22fc

kernel/cgroup/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -2331,7 +2331,7 @@ static struct file_system_type cgroup2_fs_type = { 
	.fs_flags		= FS_USERNS_MOUNT,

};



#ifdef CONFIG_CPUSETS

#ifdef CONFIG_CPUSETS_V1

static const struct fs_context_operations cpuset_fs_context_ops = {

	.get_tree	= cgroup1_get_tree,

	.free		= cgroup_fs_context_free,
@@ -6236,7 +6236,7 @@ int __init cgroup_init(void) 
	WARN_ON(register_filesystem(&cgroup_fs_type));

	WARN_ON(register_filesystem(&cgroup2_fs_type));

	WARN_ON(!proc_create_single("cgroups", 0, NULL, proc_cgroupstats_show));

#ifdef CONFIG_CPUSETS

#ifdef CONFIG_CPUSETS_V1

	WARN_ON(register_filesystem(&cpuset_fs_type));

#endif