Commit 4b3bd22b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup updates from Tejun Heo:
 "Nothing interesting. Just two minor patches"

* 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: fix typos in comments
  cgroup: cgroup.{procs,threads} factor out common parts
parents b12b4724 415de5fd

kernel/cgroup/cgroup.c

+14 −41
Original line number Diff line number Diff line
@@ -4728,8 +4728,8 @@ static int cgroup_attach_permissions(struct cgroup *src_cgrp, 
	return ret;

}



static ssize_t cgroup_procs_write(struct kernfs_open_file *of,

				  char *buf, size_t nbytes, loff_t off)

static ssize_t __cgroup_procs_write(struct kernfs_open_file *of, char *buf,

				    bool threadgroup)

{

	struct cgroup *src_cgrp, *dst_cgrp;

	struct task_struct *task;
@@ -4740,7 +4740,7 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, 
	if (!dst_cgrp)

		return -ENODEV;



	task = cgroup_procs_write_start(buf, true, &locked);

	task = cgroup_procs_write_start(buf, threadgroup, &locked);

	ret = PTR_ERR_OR_ZERO(task);

	if (ret)

		goto out_unlock;
@@ -4750,19 +4750,26 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, 
	src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);

	spin_unlock_irq(&css_set_lock);



	/* process and thread migrations follow same delegation rule */

	ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,

					of->file->f_path.dentry->d_sb, true);

					of->file->f_path.dentry->d_sb, threadgroup);

	if (ret)

		goto out_finish;



	ret = cgroup_attach_task(dst_cgrp, task, true);

	ret = cgroup_attach_task(dst_cgrp, task, threadgroup);



out_finish:

	cgroup_procs_write_finish(task, locked);

out_unlock:

	cgroup_kn_unlock(of->kn);



	return ret ?: nbytes;

	return ret;

}



static ssize_t cgroup_procs_write(struct kernfs_open_file *of,

				  char *buf, size_t nbytes, loff_t off)

{

	return __cgroup_procs_write(of, buf, true) ?: nbytes;

}



static void *cgroup_threads_start(struct seq_file *s, loff_t *pos)
@@ -4773,41 +4780,7 @@ static void *cgroup_threads_start(struct seq_file *s, loff_t *pos) 
static ssize_t cgroup_threads_write(struct kernfs_open_file *of,

				    char *buf, size_t nbytes, loff_t off)

{

	struct cgroup *src_cgrp, *dst_cgrp;

	struct task_struct *task;

	ssize_t ret;

	bool locked;



	buf = strstrip(buf);



	dst_cgrp = cgroup_kn_lock_live(of->kn, false);

	if (!dst_cgrp)

		return -ENODEV;



	task = cgroup_procs_write_start(buf, false, &locked);

	ret = PTR_ERR_OR_ZERO(task);

	if (ret)

		goto out_unlock;



	/* find the source cgroup */

	spin_lock_irq(&css_set_lock);

	src_cgrp = task_cgroup_from_root(task, &cgrp_dfl_root);

	spin_unlock_irq(&css_set_lock);



	/* thread migrations follow the cgroup.procs delegation rule */

	ret = cgroup_attach_permissions(src_cgrp, dst_cgrp,

					of->file->f_path.dentry->d_sb, false);

	if (ret)

		goto out_finish;



	ret = cgroup_attach_task(dst_cgrp, task, false);



out_finish:

	cgroup_procs_write_finish(task, locked);

out_unlock:

	cgroup_kn_unlock(of->kn);



	return ret ?: nbytes;

	return __cgroup_procs_write(of, buf, false) ?: nbytes;

}



/* cgroup core interface files for the default hierarchy */

kernel/cgroup/cpuset.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct cpuset { 
	 * and if it ends up empty, it will inherit the parent's mask.

	 *

	 *

	 * On legacy hierachy:

	 * On legacy hierarchy:

	 *

	 * The user-configured masks are always the same with effective masks.

	 */
@@ -1309,10 +1309,10 @@ static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd, 
 * @cs:  the cpuset to consider

 * @tmp: temp variables for calculating effective_cpus & partition setup

 *

 * When congifured cpumask is changed, the effective cpumasks of this cpuset

 * When configured cpumask is changed, the effective cpumasks of this cpuset

 * and all its descendants need to be updated.

 *

 * On legacy hierachy, effective_cpus will be the same with cpu_allowed.

 * On legacy hierarchy, effective_cpus will be the same with cpu_allowed.

 *

 * Called with cpuset_mutex held

 */