Commit 5563e770 authored by Bob Picco's avatar Bob Picco Committed by Linus Torvalds

[PATCH] cpuset: fix return without releasing semaphore

It is wrong to acquire the semaphore and then return from
cpuset_zone_allowed without releasing it.
Signed-off-by: default avatarBob Picco <bob.picco@hp.com>
Acked-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 3c8d61bc
...@@ -1809,11 +1809,12 @@ int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask) ...@@ -1809,11 +1809,12 @@ int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
if (gfp_mask & __GFP_HARDWALL) /* If hardwall request, stop here */ if (gfp_mask & __GFP_HARDWALL) /* If hardwall request, stop here */
return 0; return 0;
if (current->flags & PF_EXITING) /* Let dying task have memory */
return 1;
/* Not hardwall and node outside mems_allowed: scan up cpusets */ /* Not hardwall and node outside mems_allowed: scan up cpusets */
down(&callback_sem); down(&callback_sem);
if (current->flags & PF_EXITING) /* Let dying task have memory */
return 1;
task_lock(current); task_lock(current);
cs = nearest_exclusive_ancestor(current->cpuset); cs = nearest_exclusive_ancestor(current->cpuset);
task_unlock(current); task_unlock(current);
......
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