Commit ed29f171 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds

ipc/mqueue.c: remove duplicated code

pipelined_send() and pipelined_receive() are identical, so merge them.

[manfred@colorfullife.com: add changelog]
Link: http://lkml.kernel.org/r/20191020123305.14715-3-manfred@colorfullife.comSigned-off-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarManfred Spraul <manfred@colorfullife.com>
Cc: <1vier1@web.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 39323c64
...@@ -918,17 +918,12 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name) ...@@ -918,17 +918,12 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
* The same algorithm is used for senders. * The same algorithm is used for senders.
*/ */
/* pipelined_send() - send a message directly to the task waiting in static inline void __pipelined_op(struct wake_q_head *wake_q,
* sys_mq_timedreceive() (without inserting message into a queue).
*/
static inline void pipelined_send(struct wake_q_head *wake_q,
struct mqueue_inode_info *info, struct mqueue_inode_info *info,
struct msg_msg *message, struct ext_wait_queue *this)
struct ext_wait_queue *receiver)
{ {
receiver->msg = message; list_del(&this->list);
list_del(&receiver->list); wake_q_add(wake_q, this->task);
wake_q_add(wake_q, receiver->task);
/* /*
* Rely on the implicit cmpxchg barrier from wake_q_add such * Rely on the implicit cmpxchg barrier from wake_q_add such
* that we can ensure that updating receiver->state is the last * that we can ensure that updating receiver->state is the last
...@@ -937,7 +932,19 @@ static inline void pipelined_send(struct wake_q_head *wake_q, ...@@ -937,7 +932,19 @@ static inline void pipelined_send(struct wake_q_head *wake_q,
* yet, at that point we can later have a use-after-free * yet, at that point we can later have a use-after-free
* condition and bogus wakeup. * condition and bogus wakeup.
*/ */
receiver->state = STATE_READY; this->state = STATE_READY;
}
/* pipelined_send() - send a message directly to the task waiting in
* sys_mq_timedreceive() (without inserting message into a queue).
*/
static inline void pipelined_send(struct wake_q_head *wake_q,
struct mqueue_inode_info *info,
struct msg_msg *message,
struct ext_wait_queue *receiver)
{
receiver->msg = message;
__pipelined_op(wake_q, info, receiver);
} }
/* pipelined_receive() - if there is task waiting in sys_mq_timedsend() /* pipelined_receive() - if there is task waiting in sys_mq_timedsend()
...@@ -955,9 +962,7 @@ static inline void pipelined_receive(struct wake_q_head *wake_q, ...@@ -955,9 +962,7 @@ static inline void pipelined_receive(struct wake_q_head *wake_q,
if (msg_insert(sender->msg, info)) if (msg_insert(sender->msg, info))
return; return;
list_del(&sender->list); __pipelined_op(wake_q, info, sender);
wake_q_add(wake_q, sender->task);
sender->state = STATE_READY;
} }
static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment