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@hurleysoftware.com>
Acked-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index fede1d06ef30..b46473074662 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -862,16 +862,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
                                                 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;
@@ -892,8 +884,10 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
                          * 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();