diff options
author | Davidlohr Bueso <dave@stgolabs.net> | 2016-10-11 16:54:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-11 18:06:33 -0400 |
commit | d0d6a2a95e80e63827ea1ca184754a990438c072 (patch) | |
tree | 495297cb0875c279ef9d917c5f095c02d89c95c8 /ipc | |
parent | e3658538bf3727383b4e563fbab83c04d615508a (diff) |
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>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/msg.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -167,7 +167,7 @@ static inline void ss_del(struct msg_sender *mss) | |||
167 | } | 167 | } |
168 | 168 | ||
169 | static void ss_wakeup(struct list_head *h, | 169 | static void ss_wakeup(struct list_head *h, |
170 | struct wake_q_head *wake_q, int kill) | 170 | struct wake_q_head *wake_q, bool kill) |
171 | { | 171 | { |
172 | struct msg_sender *mss, *t; | 172 | struct msg_sender *mss, *t; |
173 | 173 | ||
@@ -204,7 +204,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) | |||
204 | WAKE_Q(wake_q); | 204 | WAKE_Q(wake_q); |
205 | 205 | ||
206 | expunge_all(msq, -EIDRM, &wake_q); | 206 | expunge_all(msq, -EIDRM, &wake_q); |
207 | ss_wakeup(&msq->q_senders, &wake_q, 1); | 207 | ss_wakeup(&msq->q_senders, &wake_q, true); |
208 | msg_rmid(ns, msq); | 208 | msg_rmid(ns, msq); |
209 | ipc_unlock_object(&msq->q_perm); | 209 | ipc_unlock_object(&msq->q_perm); |
210 | wake_up_q(&wake_q); | 210 | wake_up_q(&wake_q); |
@@ -388,7 +388,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, | |||
388 | * Sleeping senders might be able to send | 388 | * Sleeping senders might be able to send |
389 | * due to a larger queue size. | 389 | * due to a larger queue size. |
390 | */ | 390 | */ |
391 | ss_wakeup(&msq->q_senders, &wake_q, 0); | 391 | ss_wakeup(&msq->q_senders, &wake_q, false); |
392 | ipc_unlock_object(&msq->q_perm); | 392 | ipc_unlock_object(&msq->q_perm); |
393 | wake_up_q(&wake_q); | 393 | wake_up_q(&wake_q); |
394 | 394 | ||
@@ -882,7 +882,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl | |||
882 | msq->q_cbytes -= msg->m_ts; | 882 | msq->q_cbytes -= msg->m_ts; |
883 | atomic_sub(msg->m_ts, &ns->msg_bytes); | 883 | atomic_sub(msg->m_ts, &ns->msg_bytes); |
884 | atomic_dec(&ns->msg_hdrs); | 884 | atomic_dec(&ns->msg_hdrs); |
885 | ss_wakeup(&msq->q_senders, &wake_q, 0); | 885 | ss_wakeup(&msq->q_senders, &wake_q, false); |
886 | 886 | ||
887 | goto out_unlock0; | 887 | goto out_unlock0; |
888 | } | 888 | } |