Skip to content

Commit a73456f

Browse files
lizf-oshtejun
authored andcommitted
cpuset: re-structure update_cpumask() a bit
Check if cpus_allowed is to be changed before calling validate_change(). This won't change any behavior, but later it will allow us to do this: # mkdir /cpuset/child # echo $$ > /cpuset/child/tasks /* empty cpuset */ # echo > /cpuset/child/cpuset.cpus /* do nothing, won't fail */ Without this patch, the last operation will fail. Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 249cc86 commit a73456f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

kernel/cpuset.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -856,14 +856,15 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
856856
if (!cpumask_subset(trialcs->cpus_allowed, cpu_active_mask))
857857
return -EINVAL;
858858
}
859-
retval = validate_change(cs, trialcs);
860-
if (retval < 0)
861-
return retval;
862859

863860
/* Nothing to do if the cpus didn't change */
864861
if (cpumask_equal(cs->cpus_allowed, trialcs->cpus_allowed))
865862
return 0;
866863

864+
retval = validate_change(cs, trialcs);
865+
if (retval < 0)
866+
return retval;
867+
867868
retval = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL);
868869
if (retval)
869870
return retval;

0 commit comments

Comments
 (0)