Commit de2657f9 authored by Rik van Riel's avatar Rik van Riel Committed by Linus Torvalds

ipc,sem: fix semctl(..., GETNCNT)

The semctl GETNCNT returns the number of semops waiting for the
specified semaphore to become nonzero.  After commit 9f1bc2c9
("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: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ebc2e5e6
...@@ -796,6 +796,13 @@ static int count_semncnt (struct sem_array * sma, ushort semnum) ...@@ -796,6 +796,13 @@ static int count_semncnt (struct sem_array * sma, ushort semnum)
struct sem_queue * q; struct sem_queue * q;
semncnt = 0; 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) { list_for_each_entry(q, &sma->sem_pending, list) {
struct sembuf * sops = q->sops; struct sembuf * sops = q->sops;
int nsops = q->nsops; int nsops = q->nsops;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment