fsnotify: remove group->mask

[net-next-2.6.git] / fs / notify / group.c

diff --git a/fs/notify/group.c b/fs/notify/group.c
index 7ac65ed4735bad5b961ec498186e4ef7133a9092..fc0d966b270f74401047178050b1e27b8616bbeb 100644 (file)
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -30,62 +30,10 @@
 
 /* protects writes to fsnotify_groups and fsnotify_mask */
 static DEFINE_MUTEX(fsnotify_grp_mutex);
-/* protects reads while running the fsnotify_groups list */
-struct srcu_struct fsnotify_grp_srcu;
 /* all groups registered to receive inode filesystem notifications */
 LIST_HEAD(fsnotify_inode_groups);
 /* all groups registered to receive mount point filesystem notifications */
 LIST_HEAD(fsnotify_vfsmount_groups);
-/* bitwise OR of all events (FS_*) interesting to some group on this system */
-__u32 fsnotify_inode_mask;
-/* bitwise OR of all events (FS_*) interesting to some group on this system */
-__u32 fsnotify_vfsmount_mask;
-
-/*
- * When a new group registers or changes it's set of interesting events
- * this function updates the fsnotify_mask to contain all interesting events
- */
-void fsnotify_recalc_global_mask(void)
-{
-       struct fsnotify_group *group;
-       __u32 inode_mask = 0;
-       __u32 vfsmount_mask = 0;
-       int idx;
-
-       idx = srcu_read_lock(&fsnotify_grp_srcu);
-       list_for_each_entry_rcu(group, &fsnotify_inode_groups, inode_group_list)
-               inode_mask |= group->mask;
-       list_for_each_entry_rcu(group, &fsnotify_vfsmount_groups, vfsmount_group_list)
-               vfsmount_mask |= group->mask;
-               
-       srcu_read_unlock(&fsnotify_grp_srcu, idx);
-
-       fsnotify_inode_mask = inode_mask;
-       fsnotify_vfsmount_mask = vfsmount_mask;
-}
-
-/*
- * Update the group->mask by running all of the marks associated with this
- * group and finding the bitwise | of all of the mark->mask.  If we change
- * the group->mask we need to update the global mask of events interesting
- * to the system.
- */
-void fsnotify_recalc_group_mask(struct fsnotify_group *group)
-{
-       __u32 mask = 0;
-       __u32 old_mask = group->mask;
-       struct fsnotify_mark *mark;
-
-       spin_lock(&group->mark_lock);
-       list_for_each_entry(mark, &group->marks_list, g_list)
-               mask |= mark->mask;
-       spin_unlock(&group->mark_lock);
-
-       group->mask = mask;
-
-       if (old_mask != mask)
-               fsnotify_recalc_global_mask();
-}
 
 void fsnotify_add_vfsmount_group(struct fsnotify_group *group)
 {
@@ -168,6 +116,8 @@ static void fsnotify_destroy_group(struct fsnotify_group *group)
        /* clear all inode marks for this group */
        fsnotify_clear_marks_by_group(group);
 
+       synchronize_srcu(&fsnotify_mark_srcu);
+
        /* past the point of no return, matches the initial value of 1 */
        if (atomic_dec_and_test(&group->num_marks))
                fsnotify_final_destroy_group(group);
@@ -216,15 +166,8 @@ void fsnotify_put_group(struct fsnotify_group *group)
         */
        __fsnotify_evict_group(group);
 
-       /*
-        * now it's off the list, so the only thing we might care about is
-        * srcu access....
-        */
        mutex_unlock(&fsnotify_grp_mutex);
-       synchronize_srcu(&fsnotify_grp_srcu);
 
-       /* and now it is really dead. _Nothing_ could be seeing it */
-       fsnotify_recalc_global_mask();
        fsnotify_destroy_group(group);
 }