Skip to content

Commit

Permalink
ipc/msg: make ss_wakeup() kill arg boolean
Browse files Browse the repository at this point in the history
... 'tis annoying.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Davidlohr Bueso <[email protected]>
Acked-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Manfred Spraul <[email protected]>
Cc: Sebastian Andrzej Siewior <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Davidlohr Bueso authored and torvalds committed Oct 11, 2016
1 parent e365853 commit d0d6a2a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ipc/msg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit d0d6a2a

Please sign in to comment.