summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@stgolabs.net>2016-10-11 13:54:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:33 -0700
commitd0d6a2a95e80e63827ea1ca184754a990438c072 (patch)
tree495297cb0875c279ef9d917c5f095c02d89c95c8
parente3658538bf3727383b4e563fbab83c04d615508a (diff)
downloadlinux-stable-d0d6a2a95e80e63827ea1ca184754a990438c072.tar.gz
linux-stable-d0d6a2a95e80e63827ea1ca184754a990438c072.tar.bz2
linux-stable-d0d6a2a95e80e63827ea1ca184754a990438c072.zip
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>
-rw-r--r--ipc/msg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index d320024d6a5b..3c44bbcc05f6 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -167,7 +167,7 @@ static inline void ss_del(struct msg_sender *mss)
}
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;
@@ -204,7 +204,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
WAKE_Q(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);
ipc_unlock_object(&msq->q_perm);
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
* 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);
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;
atomic_sub(msg->m_ts, &ns->msg_bytes);
atomic_dec(&ns->msg_hdrs);
- ss_wakeup(&msq->q_senders, &wake_q, 0);
+ ss_wakeup(&msq->q_senders, &wake_q, false);
goto out_unlock0;
}