ipc: simplify msg list search
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>
diff --git a/ipc/msg.c b/ipc/msg.c
index 7c209b4f..a922750 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -836,7 +836,7 @@
for (;;) {
struct msg_receiver msr_d;
- struct list_head *tmp;
+ struct msg_msg *walk_msg;
long msg_counter = 0;
msg = ERR_PTR(-EACCES);
@@ -844,11 +844,8 @@
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 @@
break;
msg_counter++;
}
- tmp = tmp->next;
}
if (!IS_ERR(msg)) {
/*
