From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757316Ab3BZCt0 (ORCPT ); Mon, 25 Feb 2013 21:49:26 -0500 Received: from mailout02.c08.mtsvc.net ([205.186.168.190]:38489 "EHLO mailout02.c08.mtsvc.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750973Ab3BZCtZ (ORCPT ); Mon, 25 Feb 2013 21:49:25 -0500 From: Peter Hurley To: Stanislav Kinsbursky Cc: Andrew Morton , linux-kernel@vger.kernel.org, Dave Jones , Peter Hurley Subject: [PATCH v2 09/10] ipc: Simplify msg list search Date: Mon, 25 Feb 2013 21:48:56 -0500 Message-Id: <1361846936-9394-1-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361845307-12737-10-git-send-email-peter@hurleysoftware.com> References: <1361845307-12737-10-git-send-email-peter@hurleysoftware.com> X-Authenticated-User: 125194 peter@hurleysoftware.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Peter Hurley --- v2 - /s/qmessages/q_messages/ ipc/msg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ipc/msg.c b/ipc/msg.c index 418c5a5..ba431c9 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)) { /* -- 1.8.1.2