From a99326bd4480fb5b78f8117433a3836d2db1fcd6 Mon Sep 17 00:00:00 2001
From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Fri, 23 Mar 2012 02:42:23 +0100
Subject: [PATCH] --- yaml --- r: 347905 b: refs/heads/master c:
 03a1cec1f17ac1a6041996b3e40f96b5a2f90e1b h: refs/heads/master i:   347903:
 a86bb6729ca889037c7d91505a9a48b432b3eb7a v: v3

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

diff --git a/[refs] b/[refs]
index 65293cb6e642..7f91fc3bfd92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a6b6bd5919a65030b557ec8fe81f6fb3e93744a
+refs/heads/master: 03a1cec1f17ac1a6041996b3e40f96b5a2f90e1b
diff --git a/trunk/fs/notify/fanotify/fanotify.c b/trunk/fs/notify/fanotify/fanotify.c
index f35794b97e8e..aeb5b5abbd4f 100644
--- a/trunk/fs/notify/fanotify/fanotify.c
+++ b/trunk/fs/notify/fanotify/fanotify.c
@@ -18,6 +18,12 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)
 	    old->tgid == new->tgid) {
 		switch (old->data_type) {
 		case (FSNOTIFY_EVENT_PATH):
+#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
+			/* dont merge two permission events */
+			if ((old->mask & FAN_ALL_PERM_EVENTS) &&
+			    (new->mask & FAN_ALL_PERM_EVENTS))
+				return false;
+#endif
 			if ((old->path.mnt == new->path.mnt) &&
 			    (old->path.dentry == new->path.dentry))
 				return true;