Commit a22509a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cgroup-for-6.15-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fixes from Tejun Heo:

 - Fix compilation in CONFIG_LOCKDEP && !CONFIG_PROVE_RCU configurations

 - Allow "cpuset_v2_mode" mount option for "cpuset" filesystem type to
   make life easier for android

* tag 'cgroup-for-6.15-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
  cgroup: Fix compilation issue due to cgroup_mutex not being exported
parents 9d7a0577 1bf67c8f

kernel/cgroup/cgroup.c

+30 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
DEFINE_MUTEX(cgroup_mutex);

DEFINE_SPINLOCK(css_set_lock);



#ifdef CONFIG_PROVE_RCU

#if (defined CONFIG_PROVE_RCU || defined CONFIG_LOCKDEP)

EXPORT_SYMBOL_GPL(cgroup_mutex);

EXPORT_SYMBOL_GPL(css_set_lock);

#endif
@@ -2353,9 +2353,37 @@ static struct file_system_type cgroup2_fs_type = { 
};



#ifdef CONFIG_CPUSETS_V1

enum cpuset_param {

	Opt_cpuset_v2_mode,

};



static const struct fs_parameter_spec cpuset_fs_parameters[] = {

	fsparam_flag  ("cpuset_v2_mode", Opt_cpuset_v2_mode),

	{}

};



static int cpuset_parse_param(struct fs_context *fc, struct fs_parameter *param)

{

	struct cgroup_fs_context *ctx = cgroup_fc2context(fc);

	struct fs_parse_result result;

	int opt;



	opt = fs_parse(fc, cpuset_fs_parameters, param, &result);

	if (opt < 0)

		return opt;



	switch (opt) {

	case Opt_cpuset_v2_mode:

		ctx->flags |= CGRP_ROOT_CPUSET_V2_MODE;

		return 0;

	}

	return -EINVAL;

}



static const struct fs_context_operations cpuset_fs_context_ops = {

	.get_tree	= cgroup1_get_tree,

	.free		= cgroup_fs_context_free,

	.parse_param	= cpuset_parse_param,

};



/*
@@ -2392,6 +2420,7 @@ static int cpuset_init_fs_context(struct fs_context *fc) 
static struct file_system_type cpuset_fs_type = {

	.name			= "cpuset",

	.init_fs_context	= cpuset_init_fs_context,

	.parameters		= cpuset_fs_parameters,

	.fs_flags		= FS_USERNS_MOUNT,

};

#endif