summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Picco <bob.picco@hp.com>2005-11-13 16:06:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:11 -0800
commit5563e77078d85c4f107a0a673500c43ce57cf702 (patch)
treeb9cacaa2f6ad595d6ade9e69f8a84d7c9b063048
parent3c8d61bcf2d762fb84dbf741df400c833cada18a (diff)
downloadop-kernel-dev-5563e77078d85c4f107a0a673500c43ce57cf702.zip
op-kernel-dev-5563e77078d85c4f107a0a673500c43ce57cf702.tar.gz
[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: Bob Picco <bob.picco@hp.com> Acked-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/cpuset.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 5a737ed..7430640 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -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 */
return 0;
+ if (current->flags & PF_EXITING) /* Let dying task have memory */
+ return 1;
+
/* Not hardwall and node outside mems_allowed: scan up cpusets */
down(&callback_sem);
- if (current->flags & PF_EXITING) /* Let dying task have memory */
- return 1;
task_lock(current);
cs = nearest_exclusive_ancestor(current->cpuset);
task_unlock(current);
OpenPOWER on IntegriCloud