Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

kernel/cpuset.c

+3 −2
Original line number Diff line number Diff line
@@ -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);