[PATCH] cpuset: update_nodemask code reformat (59dac16f) · Commits · 戴 / test

Restructure code layout of the kernel/cpuset.c update_nodemask() routine, removing embedded returns and nested if's in favor of goto completion labels. This is being done in anticipation of adding more logic to this routine, which will favor the goto style structure. Signed-off-by:

Paul Jackson <pj@sgi.com> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

kernel/cpuset.c

+15 −10

Original line number	Diff line number	Diff line
		@@ -799,18 +799,23 @@ static int update_nodemask(struct cpuset cs, char buf)
		trialcs = *cs;
		retval = nodelist_parse(buf, trialcs.mems_allowed);
		if (retval < 0)
		return retval;
		goto done;
		nodes_and(trialcs.mems_allowed, trialcs.mems_allowed, node_online_map);
		if (nodes_empty(trialcs.mems_allowed))
		return -ENOSPC;
		if (nodes_empty(trialcs.mems_allowed)) {
		retval = -ENOSPC;
		goto done;
		}
		retval = validate_change(cs, &trialcs);
		if (retval == 0) {
		if (retval < 0)
		goto done;

		down(&callback_sem);
		cs->mems_allowed = trialcs.mems_allowed;
		atomic_inc(&cpuset_mems_generation);
		cs->mems_generation = atomic_read(&cpuset_mems_generation);
		up(&callback_sem);
		}

		done:
		return retval;
		}

Admin message