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

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

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

Pull cgroup fix from Tejun Heo:
 "A late fix for cgroup.

  This fixes a behavior regression visible to userland which was created
  by a commit merged during -rc1.  While the behavior change isn't too
  likely to be noticeable, the fix is relatively low risk and we'll need
  to backport it through -stable anyway if the bug gets released"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: fix a regression in validating config change
parents f07823e1 1c09b195

kernel/cpuset.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -475,13 +475,17 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial) 




	/*

	/*

	 * Cpusets with tasks - existing or newly being attached - can't

	 * Cpusets with tasks - existing or newly being attached - can't

	 * have empty cpus_allowed or mems_allowed.

	 * be changed to have empty cpus_allowed or mems_allowed.

	 */

	 */

	ret = -ENOSPC;

	ret = -ENOSPC;

	if ((cgroup_task_count(cur->css.cgroup) || cur->attach_in_progress) &&

	if ((cgroup_task_count(cur->css.cgroup) || cur->attach_in_progress)) {

	    (cpumask_empty(trial->cpus_allowed) &&

		if (!cpumask_empty(cur->cpus_allowed) &&

	     nodes_empty(trial->mems_allowed)))

		    cpumask_empty(trial->cpus_allowed))

			goto out;

			goto out;

		if (!nodes_empty(cur->mems_allowed) &&

		    nodes_empty(trial->mems_allowed))

			goto out;

	}





	ret = 0;

	ret = 0;

out:

out: