aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2013-01-04 15:34:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-04 16:11:45 -0800
commit9afdacda0252fc1ddb7907728e878518edbcdfce (patch)
tree1ec270f4fd688353c51c2d21f26b22b00f7ef65a
parent2d79cf8a9dfbaef1e57c88a709689577c8482a17 (diff)
ipc: remove forced assignment of selected message
This is a cleanup patch. The assignment is redundant. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Cc: Serge Hallyn <serge.hallyn@canonical.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Pavel Emelyanov <xemul@parallels.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--ipc/msg.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index a71af5a65ab..2f272fa7659 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -793,12 +793,9 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
msg = walk_msg;
if (mode == SEARCH_LESSEQUAL &&
walk_msg->m_type != 1) {
- msg = walk_msg;
msgtyp = walk_msg->m_type - 1;
- } else {
- msg = walk_msg;
+ } else
break;
- }
}
tmp = tmp->next;
}