aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2013-05-09 16:59:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 14:17:47 -0700
commitde2657f94acd4f0df44626db7c4d2b71babc8cd3 (patch)
tree4499951b79ff2d199bca0d87ef379d829cc1e400 /ipc
parentebc2e5e6a408a0e6ed63c0ba98c2c8a232c6b4f4 (diff)
downloadlinaro-lsk-de2657f94acd4f0df44626db7c4d2b71babc8cd3.tar.gz
ipc,sem: fix semctl(..., GETNCNT)
The semctl GETNCNT returns the number of semops waiting for the specified semaphore to become nonzero. 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. Signed-off-by: Rik van Riel <riel@redhat.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 04b264dbf14..a7e40ed8a07 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -796,6 +796,13 @@ static int count_semncnt (struct sem_array * sma, ushort semnum)
struct sem_queue * q;
semncnt = 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))
+ semncnt++;
+ }
+
list_for_each_entry(q, &sma->sem_pending, list) {
struct sembuf * sops = q->sops;
int nsops = q->nsops;