summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2013-05-09 16:53:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 14:17:47 -0700
commitebc2e5e6a408a0e6ed63c0ba98c2c8a232c6b4f4 (patch)
treeeb376fff2b32ae63b6d5ba8faac2f26a899d51df /ipc
parent07e074503eba3ee657ab50a8c9497ddf90039e7e (diff)
downloadlinux-stable-ebc2e5e6a408a0e6ed63c0ba98c2c8a232c6b4f4.tar.gz
linux-stable-ebc2e5e6a408a0e6ed63c0ba98c2c8a232c6b4f4.tar.bz2
linux-stable-ebc2e5e6a408a0e6ed63c0ba98c2c8a232c6b4f4.zip
ipc,sem: fix semctl(..., GETZCNT)
The semctl GETZCNT returns the number of semops waiting for the specified semaphore to become zero. After commit 9f1bc2c9022c ("ipc,sem: have only one list in struct sem_queue"), the semops waiting on just one semaphore are waiting on that semaphore's list. In order to return the correct count, we have to walk that list too, in addition to the sem_array's list for complex operations. This bug broke dbench; it works again with this patch applied. Signed-off-by: Rik van Riel <riel@redhat.com> Reported-by: Kent Overstreet <koverstreet@google.com> Tested-by: Kent Overstreet <koverstreet@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/sem.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 899b598b63be..04b264dbf141 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -815,6 +815,13 @@ static int count_semzcnt (struct sem_array * sma, ushort semnum)
struct sem_queue * q;
semzcnt = 0;
+ list_for_each_entry(q, &sma->sem_base[semnum].sem_pending, list) {
+ struct sembuf * sops = q->sops;
+ BUG_ON(sops->sem_num != semnum);
+ if ((sops->sem_op == 0) && !(sops->sem_flg & IPC_NOWAIT))
+ semzcnt++;
+ }
+
list_for_each_entry(q, &sma->sem_pending, list) {
struct sembuf * sops = q->sops;
int nsops = q->nsops;