Commit 69604067 authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds

[PATCH] cpuset: minor code refinements

A couple of minor code simplifications to the kernel/cpuset.c code.  No
functional change.  Just a little less code and a little more readable.
Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ec68b2e
...@@ -729,9 +729,11 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial) ...@@ -729,9 +729,11 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial)
} }
/* Remaining checks don't apply to root cpuset */ /* Remaining checks don't apply to root cpuset */
if ((par = cur->parent) == NULL) if (cur == &top_cpuset)
return 0; return 0;
par = cur->parent;
/* We must be a subset of our parent cpuset */ /* We must be a subset of our parent cpuset */
if (!is_cpuset_subset(trial, par)) if (!is_cpuset_subset(trial, par))
return -EACCES; return -EACCES;
...@@ -1060,10 +1062,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf) ...@@ -1060,10 +1062,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf)
cpu_exclusive_changed = cpu_exclusive_changed =
(is_cpu_exclusive(cs) != is_cpu_exclusive(&trialcs)); (is_cpu_exclusive(cs) != is_cpu_exclusive(&trialcs));
mutex_lock(&callback_mutex); mutex_lock(&callback_mutex);
if (turning_on) cs->flags = trialcs.flags;
set_bit(bit, &cs->flags);
else
clear_bit(bit, &cs->flags);
mutex_unlock(&callback_mutex); mutex_unlock(&callback_mutex);
if (cpu_exclusive_changed) if (cpu_exclusive_changed)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment