---

yaml --- r: 362122 b: refs/heads/master c: 2dc958f h: refs/heads/master v: v3
git-mirror · Apr 2, 2013 · 871be22 · 871be22
1 parent c50a7e7
commit 871be22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 118c9a45fdacc6fe57910fa1d048e2d5bbc193f4
+refs/heads/master: 2dc958fa2fe6987e7ab106bd97029a09a82fcd8d
diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c
@@ -872,6 +872,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
 							goto out_unlock;
 						break;
 					}
+					msg = ERR_PTR(-EAGAIN);
 				} else
 					break;
 				msg_counter++;
-Original file line number
+Diff line change
@@ Expand Up @@
     							goto out_unlock;
     						break;
     					}
+    					msg = ERR_PTR(-EAGAIN);
     				} else
     					break;
     				msg_counter++;
@@ Expand Down @@