The patch titled
Subject: ipc: remove msg handling from queue scan
has been removed from the -mm tree. Its filename was
ipc-remove-msg-handling-from-queue-scan.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Subject: ipc: remove msg handling from queue scan
In preparation for refactoring the queue scan into a separate
function, relocate msg copying.
Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Acked-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/msg.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff -puN ipc/msg.c~ipc-remove-msg-handling-from-queue-scan ipc/msg.c
--- a/ipc/msg.c~ipc-remove-msg-handling-from-queue-scan
+++ a/ipc/msg.c
@@ -860,16 +860,8 @@ long do_msgrcv(int msqid, void __user *b
walk_msg->m_type != 1) {
msgtyp = walk_msg->m_type - 1;
} else if (msgflg & MSG_COPY) {
- if (copy_number == msg_counter) {
- /*
- * Found requested message.
- * Copy it.
- */
- msg = copy_msg(msg, copy);
- if (IS_ERR(msg))
- goto out_unlock;
+ if (copy_number == msg_counter)
break;
- }
msg = ERR_PTR(-EAGAIN);
} else
break;
@@ -890,8 +882,10 @@ long do_msgrcv(int msqid, void __user *b
* If we are copying, then do not unlink message and do
* not update queue parameters.
*/
- if (msgflg & MSG_COPY)
+ if (msgflg & MSG_COPY) {
+ msg = copy_msg(msg, copy);
goto out_unlock;
+ }
list_del(&msg->m_list);
msq->q_qnum--;
msq->q_rtime = get_seconds();
_
Patches currently in -mm which might be from peter@xxxxxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
