5 files changed, 9 insertions, 7 deletions

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 7e54e52964dd..85b97fca14de 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -362,7 +362,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
                 dnentry = container_of(entry, struct dnotify_mark_entry, fsn_entry);
                 spin_lock(&entry->lock);
         } else {
-                fsnotify_add_mark(new_entry, dnotify_group, inode);
+                fsnotify_add_mark(new_entry, dnotify_group, inode, 0);
                 spin_lock(&new_entry->lock);
                 entry = new_entry;
                 dnentry = new_dnentry;
diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index a13cf9e9233a..7d2962e5328e 100644
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -312,9 +312,10 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
  * event types should be delivered to which group and for which inodes.
  */
 int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
-                      struct fsnotify_group *group, struct inode *inode)
+                      struct fsnotify_group *group, struct inode *inode,
+                      int allow_dups)
 {
-        struct fsnotify_mark_entry *lentry;
+        struct fsnotify_mark_entry *lentry = NULL;
         int ret = 0;
 
         inode = igrab(inode);
@@ -331,7 +332,8 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
         spin_lock(&group->mark_lock);
         spin_lock(&inode->i_lock);
 
-        lentry = fsnotify_find_mark_entry(group, inode);
+        if (!allow_dups)
+                lentry = fsnotify_find_mark_entry(group, inode);
         if (!lentry) {
                 entry->group = group;
                 entry->inode = inode;
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 653c507b1bb3..f22a04005db2 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -651,7 +651,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
                 goto out_err;
 
         /* we are on the idr, now get on the inode */
-        ret = fsnotify_add_mark(&tmp_ientry->fsn_entry, group, inode);
+        ret = fsnotify_add_mark(&tmp_ientry->fsn_entry, group, inode, 0);
         if (ret) {
                 /* we failed to get on the inode, get off the idr */
                 inotify_remove_from_idr(group, tmp_ientry);
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 390516732956..1679f250d59e 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -345,7 +345,7 @@ extern struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_grou
 /* copy the values from old into new */
 extern void fsnotify_duplicate_mark(struct fsnotify_mark_entry *new, struct fsnotify_mark_entry *old);
 /* attach the mark to both the group and the inode */
-extern int fsnotify_add_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group, struct inode *inode);
+extern int fsnotify_add_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group, struct inode *inode, int allow_dups);
 /* given a mark, flag it to be freed when all references are dropped */
 extern void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry);
 /* run all the marks in a group, and flag them to be freed */
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 75ab53987ece..c44de0c4fc47 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -161,7 +161,7 @@ static struct audit_parent *audit_init_parent(struct nameidata *ndp)
 
         fsnotify_init_mark(&parent->mark, audit_watch_free_mark);
         parent->mark.mask = AUDIT_FS_WATCH;
-        ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode);
+        ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode, 0);
         if (ret < 0) {
                 audit_free_parent(parent);
                 return ERR_PTR(ret);