Commit 74027a65 authored by Waiman Long's avatar Waiman Long Committed by Tejun Heo
Browse files

cgroup/cpuset: Relocate a code block in validate_change() 



This patch moves down the exclusive cpu and memory check in
validate_change(). There is no functional change.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7476a636

kernel/cgroup/cpuset.c

+16 −16
Original line number Diff line number Diff line
@@ -741,22 +741,6 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial) 


	par = parent_cs(cur);



	/*

	 * If either I or some sibling (!= me) is exclusive, we can't

	 * overlap

	 */

	ret = -EINVAL;

	cpuset_for_each_child(c, css, par) {

		if ((is_cpu_exclusive(trial) || is_cpu_exclusive(c)) &&

		    c != cur &&

		    cpumask_intersects(trial->cpus_allowed, c->cpus_allowed))

			goto out;

		if ((is_mem_exclusive(trial) || is_mem_exclusive(c)) &&

		    c != cur &&

		    nodes_intersects(trial->mems_allowed, c->mems_allowed))

			goto out;

	}



	/*

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

	 * be changed to have empty cpus_allowed or mems_allowed.
@@ -781,6 +765,22 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial) 
				       trial->cpus_allowed))

		goto out;



	/*

	 * If either I or some sibling (!= me) is exclusive, we can't

	 * overlap

	 */

	ret = -EINVAL;

	cpuset_for_each_child(c, css, par) {

		if ((is_cpu_exclusive(trial) || is_cpu_exclusive(c)) &&

		    c != cur &&

		    cpumask_intersects(trial->cpus_allowed, c->cpus_allowed))

			goto out;

		if ((is_mem_exclusive(trial) || is_mem_exclusive(c)) &&

		    c != cur &&

		    nodes_intersects(trial->mems_allowed, c->mems_allowed))

			goto out;

	}



	ret = 0;

out:

	rcu_read_unlock();