3 files changed, 6 insertions, 5 deletions

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 828a889be909..7e54e52964dd 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -91,6 +91,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
         struct dnotify_struct *dn;
         struct dnotify_struct **prev;
         struct fown_struct *fown;
+        __u32 test_mask = event->mask & ~FS_EVENT_ON_CHILD;
 
         to_tell = event->to_tell;
 
@@ -106,7 +107,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
         spin_lock(&entry->lock);
         prev = &dnentry->dn;
         while ((dn = *prev) != NULL) {
-                if ((dn->dn_mask & event->mask) == 0) {
+                if ((dn->dn_mask & test_mask) == 0) {
                         prev = &dn->dn_next;
                         continue;
                 }
diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index c8a07c65482b..3165d85aada2 100644
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -324,11 +324,11 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
         spin_lock(&group->mark_lock);
         spin_lock(&inode->i_lock);
 
-        entry->group = group;
-        entry->inode = inode;
-
         lentry = fsnotify_find_mark_entry(group, inode);
         if (!lentry) {
+                entry->group = group;
+                entry->inode = inode;
+
                 hlist_add_head(&entry->i_list, &inode->i_fsnotify_mark_entries);
                 list_add(&entry->g_list, &group->mark_entries);
 
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index 3816d5750dd5..b8bf53b4c108 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -143,7 +143,7 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *new
                         /* remember, after old was put on the wait_q we aren't
                          * allowed to look at the inode any more, only thing
                          * left to check was if the file_name is the same */
-                        if (old->name_len &&
+                        if (!old->name_len ||
                             !strcmp(old->file_name, new->file_name))
                                 return true;
                         break;