aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorManfred Spraul <manfred@colorfullife.com>2009-12-15 19:47:31 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:20:09 -0500
commitb6e90822e77cd476c18410f7003197d466e36ac6 (patch)
tree2ff18df8c024ae92e7e8912186c34b10b4b6f4bd /ipc
parentd4212093dca95c1f52197017d969cc66d5d962aa (diff)
ipc/sem.c: optimize if semops fail
Reduce the amount of scanning of the list of pending semaphore operations: If try_atomic_semop failed, then no changes were applied. Thus no need to restart. Additionally, this patch correct an incorrect comment: It's possible to wait for arbitrary semaphore values (do a dec by <x>, wait-for-zero, inc by <x> in one atomic operation) Both changes are from Nick Piggin, the patch is the result of a different split of the individual changes. Signed-off-by: Manfred Spraul <manfred@colorfullife.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Pierre Peiffer <peifferp@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/sem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 2705fbbc4374..eac3f46a5968 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -445,13 +445,13 @@ again:
445 * of the completed operation: 445 * of the completed operation:
446 * - if the operation modified the array, then restart from the 446 * - if the operation modified the array, then restart from the
447 * head of the queue and check for threads that might be 447 * head of the queue and check for threads that might be
448 * waiting for semaphore values to become 0. 448 * waiting for the new semaphore values.
449 * - if the operation didn't modify the array, then just 449 * - if the operation didn't modify the array, then just
450 * continue. 450 * continue.
451 */ 451 */
452 alter = q->alter; 452 alter = q->alter;
453 wake_up_sem_queue(q, error); 453 wake_up_sem_queue(q, error);
454 if (alter) 454 if (alter && !error)
455 goto again; 455 goto again;
456 } 456 }
457} 457}