hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hurley 2013-04-30 19:14:59 -07:00 committed by Linus Torvalds
parent 8ac6ed5857
commit d076ac9112
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipc/msg.c
View File

@ -836,7 +836,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
for (;;) { for (;;) {
struct msg_receiver msr_d; struct msg_receiver msr_d;
struct list_head *tmp; struct msg_msg *walk_msg;
long msg_counter = 0; long msg_counter = 0;
msg = ERR_PTR(-EACCES); msg = ERR_PTR(-EACCES);
@ -844,11 +844,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
goto out_unlock; goto out_unlock;
msg = ERR_PTR(-EAGAIN); msg = ERR_PTR(-EAGAIN);
tmp = msq->q_messages.next; list_for_each_entry(walk_msg, &msq->q_messages, m_list) {
while (tmp != &msq->q_messages) {
struct msg_msg *walk_msg;
walk_msg = list_entry(tmp, struct msg_msg, m_list);
if (testmsg(walk_msg, msgtyp, mode) && if (testmsg(walk_msg, msgtyp, mode) &&
!security_msg_queue_msgrcv(msq, walk_msg, current, !security_msg_queue_msgrcv(msq, walk_msg, current,
msgtyp, mode)) { msgtyp, mode)) {
@ -865,7 +862,6 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
break; break;
msg_counter++; msg_counter++;
} }
tmp = tmp->next;
} }
if (!IS_ERR(msg)) { if (!IS_ERR(msg)) {
/* /*