Subject: [merged] ipc-semc-bugfix-for-semctlgetzcnt.patch removed from -mm tree
To: manfred@xxxxxxxxxxxxxxxx,davidlohr.bueso@xxxxxx,mtk.manpages@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 09 Jun 2014 12:37:52 -0700
The patch titled
Subject: ipc/sem.c: bugfix for semctl(,,GETZCNT)
has been removed from the -mm tree. Its filename was
ipc-semc-bugfix-for-semctlgetzcnt.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Subject: ipc/sem.c: bugfix for semctl(,,GETZCNT)
GETZCNT is supposed to return the number of threads that wait until a
semaphore value becomes 0.
The current implementation overlooks complex operations that contain both
wait-for-zero operation and operations that alter at least one semaphore.
The patch fixes that. It's intentionally copy&paste, this will be cleaned
up in the next patch.
Signed-off-by: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Davidlohr Bueso <davidlohr.bueso@xxxxxx>
Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/sem.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff -puN ipc/sem.c~ipc-semc-bugfix-for-semctlgetzcnt ipc/sem.c
--- a/ipc/sem.c~ipc-semc-bugfix-for-semctlgetzcnt
+++ a/ipc/sem.c
@@ -1047,6 +1047,16 @@ static int count_semzcnt(struct sem_arra
&& !(sops[i].sem_flg & IPC_NOWAIT))
semzcnt++;
}
+ list_for_each_entry(q, &sma->pending_alter, list) {
+ struct sembuf *sops = q->sops;
+ int nsops = q->nsops;
+ int i;
+ for (i = 0; i < nsops; i++)
+ if (sops[i].sem_num == semnum
+ && (sops[i].sem_op == 0)
+ && !(sops[i].sem_flg & IPC_NOWAIT))
+ semzcnt++;
+ }
return semzcnt;
}
_
Patches currently in -mm which might be from manfred@xxxxxxxxxxxxxxxx are
origin.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
