p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipc/msg: make ss_wakeup() kill arg boolean 

... 'tis annoying.

Link: http://lkml.kernel.org/r/1469748819-19484-4-git-send-email-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Davidlohr Bueso 2016-10-11 13:54:59 -07:00 committed by Linus Torvalds
parent e3658538bf
commit d0d6a2a95e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipc/msg.c
View File

@ -167,7 +167,7 @@ static inline void ss_del(struct msg_sender *mss)
} }
static void ss_wakeup(struct list_head *h, static void ss_wakeup(struct list_head *h,
struct wake_q_head *wake_q, int kill) struct wake_q_head *wake_q, bool kill)
{ {
struct msg_sender *mss, *t; struct msg_sender *mss, *t;
@ -204,7 +204,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
WAKE_Q(wake_q); WAKE_Q(wake_q);
expunge_all(msq, -EIDRM, &wake_q); expunge_all(msq, -EIDRM, &wake_q);
ss_wakeup(&msq->q_senders, &wake_q, 1); ss_wakeup(&msq->q_senders, &wake_q, true);
msg_rmid(ns, msq); msg_rmid(ns, msq);
ipc_unlock_object(&msq->q_perm); ipc_unlock_object(&msq->q_perm);
wake_up_q(&wake_q); wake_up_q(&wake_q);
@ -388,7 +388,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
* Sleeping senders might be able to send * Sleeping senders might be able to send
* due to a larger queue size. * due to a larger queue size.
*/ */
ss_wakeup(&msq->q_senders, &wake_q, 0); ss_wakeup(&msq->q_senders, &wake_q, false);
ipc_unlock_object(&msq->q_perm); ipc_unlock_object(&msq->q_perm);
wake_up_q(&wake_q); wake_up_q(&wake_q);
@ -882,7 +882,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
msq->q_cbytes -= msg->m_ts; msq->q_cbytes -= msg->m_ts;
atomic_sub(msg->m_ts, &ns->msg_bytes); atomic_sub(msg->m_ts, &ns->msg_bytes);
atomic_dec(&ns->msg_hdrs); atomic_dec(&ns->msg_hdrs);
ss_wakeup(&msq->q_senders, &wake_q, 0); ss_wakeup(&msq->q_senders, &wake_q, false);
goto out_unlock0; goto out_unlock0;
} }