6 files changed, 5 insertions, 66 deletions

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index c3dc15879a52..e92b2c87ae94 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -199,8 +199,6 @@ void dnotify_flush(struct file *filp, fl_owner_t id)
         if (dn_mark->dn == NULL)
                 fsnotify_destroy_mark(fsn_mark);
 
-        fsnotify_recalc_group_mask(dnotify_group);
-
         mutex_unlock(&dnotify_mark_mutex);
 
         fsnotify_put_mark(fsn_mark);
@@ -385,8 +383,6 @@ out:
         if (destroy)
                 fsnotify_destroy_mark(fsn_mark);
 
-        fsnotify_recalc_group_mask(dnotify_group);
-
         mutex_unlock(&dnotify_mark_mutex);
         fsnotify_put_mark(fsn_mark);
 out_err:
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 50cea74bf1c8..25a3b4dfcf61 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -496,8 +496,6 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group,
 
         removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags);
         fsnotify_put_mark(fsn_mark);
-        if (removed & group->mask)
-                fsnotify_recalc_group_mask(group);
         if (removed & mnt->mnt_fsnotify_mask)
                 fsnotify_recalc_vfsmount_mask(mnt);
 
@@ -518,9 +516,6 @@ static int fanotify_remove_inode_mark(struct fsnotify_group *group,
         removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags);
         /* matches the fsnotify_find_inode_mark() */
         fsnotify_put_mark(fsn_mark);
-
-        if (removed & group->mask)
-                fsnotify_recalc_group_mask(group);
         if (removed & inode->i_fsnotify_mask)
                 fsnotify_recalc_inode_mask(inode);
 
@@ -572,12 +567,9 @@ static int fanotify_add_vfsmount_mark(struct fsnotify_group *group,
         }
         added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);
         fsnotify_put_mark(fsn_mark);
-        if (added) {
-                if (added & ~group->mask)
-                        fsnotify_recalc_group_mask(group);
-                if (added & ~mnt->mnt_fsnotify_mask)
-                        fsnotify_recalc_vfsmount_mask(mnt);
-        }
+        if (added & ~mnt->mnt_fsnotify_mask)
+                fsnotify_recalc_vfsmount_mask(mnt);
+
         return 0;
 }
 
@@ -607,12 +599,8 @@ static int fanotify_add_inode_mark(struct fsnotify_group *group,
         }
         added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);
         fsnotify_put_mark(fsn_mark);
-        if (added) {
-                if (added & ~group->mask)
-                        fsnotify_recalc_group_mask(group);
-                if (added & ~inode->i_fsnotify_mask)
-                        fsnotify_recalc_inode_mask(inode);
-        }
+        if (added & ~inode->i_fsnotify_mask)
+                fsnotify_recalc_inode_mask(inode);
         return 0;
 }
 
@@ -734,7 +722,6 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
                         fsnotify_clear_vfsmount_marks_by_group(group);
                 else
                         fsnotify_clear_inode_marks_by_group(group);
-                fsnotify_recalc_group_mask(group);
                 break;
         default:
                 ret = -EINVAL;
diff --git a/fs/notify/group.c b/fs/notify/group.c
index 8da532dd6026..fc0d966b270f 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -35,22 +35,6 @@ LIST_HEAD(fsnotify_inode_groups);
 /* all groups registered to receive mount point filesystem notifications */
 LIST_HEAD(fsnotify_vfsmount_groups);
 
-/*
- * Update the group->mask by running all of the marks associated with this
- * group and finding the bitwise | of all of the mark->mask.
- */
-void fsnotify_recalc_group_mask(struct fsnotify_group *group)
-{
-        __u32 mask = 0;
-        struct fsnotify_mark *mark;
-
-        spin_lock(&group->mark_lock);
-        list_for_each_entry(mark, &group->marks_list, g_list)
-                mask |= mark->mask;
-        group->mask = mask;
-        spin_unlock(&group->mark_lock);
-}
-
 void fsnotify_add_vfsmount_group(struct fsnotify_group *group)
 {
         struct fsnotify_group *group_iter;
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index a4cd227c4c76..bf7f6d776c31 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -606,16 +606,11 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
                 int dropped = (old_mask & ~new_mask);
                 /* more bits in this fsn_mark than the inode's mask? */
                 int do_inode = (new_mask & ~inode->i_fsnotify_mask);
-                /* more bits in this fsn_mark than the group? */
-                int do_group = (new_mask & ~group->mask);
 
                 /* update the inode with this new fsn_mark */
                 if (dropped || do_inode)
                         fsnotify_recalc_inode_mask(inode);
 
-                /* update the group mask with the new mask */
-                if (dropped || do_group)
-                        fsnotify_recalc_group_mask(group);
         }
 
         /* return the wd */
@@ -673,10 +668,6 @@ static int inotify_new_watch(struct fsnotify_group *group,
         /* return the watch descriptor for this new mark */
         ret = tmp_i_mark->wd;
 
-        /* if this mark added a new event update the group mask */
-        if (mask & ~group->mask)
-                fsnotify_recalc_group_mask(group);
-
 out_err:
         /* match the ref from fsnotify_init_mark() */
         fsnotify_put_mark(&tmp_i_mark->fsn_mark);
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 07d3c8954721..c4e7aab87461 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -120,15 +120,6 @@ struct fsnotify_group {
         struct list_head vfsmount_group_list;
 
         /*
-         * Defines all of the event types in which this group is interested.
-         * This mask is a bitwise OR of the FS_* events from above.  Each time
-         * this mask changes for a group (if it changes) the correct functions
-         * must be called to update the global structures which indicate global
-         * interest in event types.
-         */
-        __u32 mask;
-
-        /*
          * How the refcnt is used is up to each group.  When the refcnt hits 0
          * fsnotify will clean up all of the resources associated with this group.
          * As an example, the dnotify group will always have a refcnt=1 and that
@@ -367,8 +358,6 @@ static inline void __fsnotify_d_instantiate(struct dentry *dentry, struct inode
 
 /* get a reference to an existing or create a new group */
 extern struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops);
-/* run all marks associated with this group and update group->mask */
-extern void fsnotify_recalc_group_mask(struct fsnotify_group *group);
 /* drop reference on a group from fsnotify_alloc_group */
 extern void fsnotify_put_group(struct fsnotify_group *group);
 
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 097a61c65fe0..1b87e757845d 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -164,8 +164,6 @@ static struct audit_parent *audit_init_parent(struct nameidata *ndp)
                 return ERR_PTR(ret);
         }
 
-        fsnotify_recalc_group_mask(audit_watch_group);
-
         return parent;
 }
 
@@ -352,9 +350,6 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
         mutex_unlock(&audit_filter_mutex);
 
         fsnotify_destroy_mark(&parent->mark);
-
-        fsnotify_recalc_group_mask(audit_watch_group);
-
 }
 
 /* Get path information necessary for adding watches. */
@@ -505,9 +500,6 @@ void audit_remove_watch_rule(struct audit_krule *krule)
                         audit_put_parent(parent);
                 }
         }
-
-        fsnotify_recalc_group_mask(audit_watch_group);
-
 }
 
 static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,