---

yaml --- r: 335479 b: refs/heads/master c: 848561d h: refs/heads/master i: 335477: d5a18bf 335475: 00d55fa 335471: fb478cd v: v3
git-mirror · Nov 9, 2012 · 35e0d07 · 35e0d07
1 parent c1ceed1
commit 35e0d07
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: a80a6b85b428e6ce12a8363bb1f08d44c50f3252
+refs/heads/master: 848561d368751a1c0f679b9f045a02944506a801
diff --git a/trunk/fs/notify/fanotify/fanotify.c b/trunk/fs/notify/fanotify/fanotify.c
@@ -21,6 +21,7 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)
 			if ((old->path.mnt == new->path.mnt) &&
 			    (old->path.dentry == new->path.dentry))
 				return true;
+			break;
 		case (FSNOTIFY_EVENT_NONE):
 			return true;
 		default: