From 35e0d07cec5944731ee585c66bb863e97beb8a76 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Thu, 8 Nov 2012 15:53:37 -0800
Subject: [PATCH] --- yaml --- r: 335479 b: refs/heads/master c:
 848561d368751a1c0f679b9f045a02944506a801 h: refs/heads/master i:   335477:
 d5a18bf202e3ef886564b80c8c68dd7978fbff3e   335475:
 00d55fa64bd7b7475d6681712aaa28ed4c793a46   335471:
 fb478cd2485d753d31b8e852ef300958e6fd21cc v: v3

---
 [refs]                              | 2 +-
 trunk/fs/notify/fanotify/fanotify.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c4d12a72cdc..e50268583bf9 100644
--- 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
index f35794b97e8e..a50636025364 100644
--- 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: