aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/group.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-17 21:24:23 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:51 -0400
commit4ca763523e040dc61191d4866a82981a5d30a4e9 (patch)
tree9b02105e7c84853dd89eff16837a9b7fba2a1050 /fs/notify/group.c
parent36fddebaa8a9186d4f5817ab798a83400b2fb2e7 (diff)
fsnotify: add groups to fsnotify_inode_groups when registering inode watch
Currently all fsnotify groups are added immediately to the fsnotify_inode_groups list upon creation. This means, even groups with no watches (common for audit) will be on the global tracking list and will get checked for every event. This patch adds groups to the global list on when the first inode mark is added to the group. Signed-of-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/group.c')
-rw-r--r--fs/notify/group.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/notify/group.c b/fs/notify/group.c
index 656c534ffb6..34fccbd2809 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -77,12 +77,15 @@ void fsnotify_recalc_group_mask(struct fsnotify_group *group)
fsnotify_recalc_global_mask();
}
-static void fsnotify_add_group(struct fsnotify_group *group)
+void fsnotify_add_inode_group(struct fsnotify_group *group)
{
- BUG_ON(!mutex_is_locked(&fsnotify_grp_mutex));
+ mutex_lock(&fsnotify_grp_mutex);
+ if (!group->on_inode_group_list)
+ list_add_tail_rcu(&group->inode_group_list, &fsnotify_inode_groups);
group->on_inode_group_list = 1;
- list_add_tail_rcu(&group->inode_group_list, &fsnotify_inode_groups);
+
+ mutex_unlock(&fsnotify_grp_mutex);
}
/*
@@ -188,22 +191,17 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
*/
atomic_set(&group->num_marks, 1);
-
mutex_init(&group->notification_mutex);
INIT_LIST_HEAD(&group->notification_list);
init_waitqueue_head(&group->notification_waitq);
group->max_events = UINT_MAX;
+ INIT_LIST_HEAD(&group->inode_group_list);
+
spin_lock_init(&group->mark_lock);
INIT_LIST_HEAD(&group->mark_entries);
group->ops = ops;
- mutex_lock(&fsnotify_grp_mutex);
-
- fsnotify_add_group(group);
-
- mutex_unlock(&fsnotify_grp_mutex);
-
return group;
}