From 7d93e0ec3d931492b8392e61307acb79bba75632 Mon Sep 17 00:00:00 2001 From: Manfred Spraul Date: Thu, 23 Jun 2005 00:10:06 -0700 Subject: [PATCH] --- yaml --- r: 2969 b: refs/heads/master c: b78755abcdf1d7667c51580a3783e16e981ed926 h: refs/heads/master i: 2967: 3d1804267893fab39981c70cfcb037315befd6f8 v: v3 --- [refs] | 2 +- trunk/ipc/sem.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 861c6c01bc01..bba5b7604dde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0030cbf06c669b65e124414af51b5010fc53b760 +refs/heads/master: b78755abcdf1d7667c51580a3783e16e981ed926 diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c index 5ad7ac0ed60d..7e8a25c82ef3 100644 --- a/trunk/ipc/sem.c +++ b/trunk/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) {