The patch titled Subject: ipc: remove msg handling from queue scan has been added to the -mm tree. Its filename is ipc-remove-msg-handling-from-queue-scan.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 @@ -862,16 +862,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; - } } else break; msg_counter++; @@ -891,8 +883,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 ipc-fix-potential-oops-when-src-msg-4k-w-msg_copy.patch ipc-dont-allocate-a-copy-larger-than-max.patch ipc-clamp-with-min.patch ipc-separate-msg-allocation-from-userspace-copy.patch ipc-tighten-msg-copy-loops.patch ipc-set-efault-as-default-error-in-load_msg.patch ipc-remove-msg-handling-from-queue-scan.patch ipc-implement-msg_copy-as-a-new-receive-mode.patch ipc-simplify-msg-list-search.patch ipc-refactor-msg-list-search-into-separate-function.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