mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 20:24:12 +08:00
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@colorfullife.com> Cc: Davidlohr Bueso <davidlohr.bueso@hp.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4bb6657dd3
commit
1994862dc9
10
ipc/sem.c
10
ipc/sem.c
@ -1047,6 +1047,16 @@ static int count_semzcnt(struct sem_array *sma, ushort semnum)
|
||||
&& !(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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user