From 1107a4364ac693ee946a9d1795ee0a8e771237e4 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Wed, 20 Mar 2013 15:08:41 +1100 Subject: [PATCH] ipc: simplify msg list search Signed-off-by: Peter Hurley Acked-by: Stanislav Kinsbursky Signed-off-by: Andrew Morton --- ipc/msg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ipc/msg.c b/ipc/msg.c index 418c5a5a6b2b..ba431c9005d7 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -837,7 +837,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, for (;;) { struct msg_receiver msr_d; - struct list_head *tmp; + struct msg_msg *walk_msg; long msg_counter = 0; msg = ERR_PTR(-EACCES); @@ -845,11 +845,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, goto out_unlock; msg = ERR_PTR(-EAGAIN); - tmp = msq->q_messages.next; - while (tmp != &msq->q_messages) { - struct msg_msg *walk_msg; + list_for_each_entry(walk_msg, &msq->q_messages, m_list) { - walk_msg = list_entry(tmp, struct msg_msg, m_list); if (testmsg(walk_msg, msgtyp, mode) && !security_msg_queue_msgrcv(msq, walk_msg, current, msgtyp, mode)) { @@ -865,7 +862,6 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, break; msg_counter++; } - tmp = tmp->next; } if (!IS_ERR(msg)) { /* -- 2.39.5