]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ipcsem: remove superflous decrease variable from sys_semtimedop
authorManfred Spraul <manfred@colorfullife.com>
Thu, 23 Jun 2005 07:10:06 +0000 (00:10 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:45:30 +0000 (09:45 -0700)
Patrick noticed that the initial scan of the semaphore operations logs
decrease and increase operations seperately, but then both cases are or'ed
together and decrease is never used.  The attached patch removes the
decrease parameter - it shrinks sys_semtimedop() by 56 bytes.

Signed-Of-By: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
ipc/sem.c

index 5ad7ac0ed60d0dc4fa46ce06964c3cd2c6f55b8c..7e8a25c82ef3e550bdd200006d9dd711c41a3db8 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1054,7 +1054,7 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
        struct sembuf fast_sops[SEMOPM_FAST];
        struct sembuf* sops = fast_sops, *sop;
        struct sem_undo *un;
-       int undos = 0, decrease = 0, alter = 0, max;
+       int undos = 0, alter = 0, max;
        struct sem_queue queue;
        unsigned long jiffies_left = 0;
 
@@ -1089,13 +1089,10 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
                if (sop->sem_num >= max)
                        max = sop->sem_num;
                if (sop->sem_flg & SEM_UNDO)
-                       undos++;
-               if (sop->sem_op < 0)
-                       decrease = 1;
-               if (sop->sem_op > 0)
+                       undos = 1;
+               if (sop->sem_op != 0)
                        alter = 1;
        }
-       alter |= decrease;
 
 retry_undos:
        if (undos) {