diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-04-30 19:14:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 08:12:57 -0700 |
| commit | d076ac9112797884c0be35f4c93c1517aa352c0c (patch) | |
| tree | 5a39ceeebedd90e3bd4d567449e90678c932ab04 | |
| parent | 8ac6ed5857c8d583e0dc2ab2165966ab143930ad (diff) | |
| download | linux-d076ac9112797884c0be35f4c93c1517aa352c0c.tar.gz | |
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>
| -rw-r--r-- | ipc/msg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 7c209b4f5e38..a92275023134 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -836,7 +836,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); @@ -844,11 +844,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)) { /* |