dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

fsnotify: fsnotify_obtain_group should be fsnotify_alloc_group 

fsnotify_obtain_group was intended to be able to find an already existing
group.  Nothing uses that functionality.  This just renames it to
fsnotify_alloc_group so it is clear what it is doing.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris 2009-12-17 21:24:22 -05:00
parent cd7752ce7c
commit ffab83402f
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/notify/dnotify/dnotify.c
View File

@ -433,7 +433,7 @@ static int __init dnotify_init(void)
dnotify_struct_cache = KMEM_CACHE(dnotify_struct, SLAB_PANIC);
dnotify_mark_entry_cache = KMEM_CACHE(dnotify_mark_entry, SLAB_PANIC);
dnotify_group = fsnotify_obtain_group(0, &dnotify_fsnotify_ops);
dnotify_group = fsnotify_alloc_group(0, &dnotify_fsnotify_ops);
if (IS_ERR(dnotify_group))
panic("unable to allocate fsnotify group for dnotify\n");
return 0;

10
fs/notify/group.c
View File

@ -162,16 +162,13 @@ void fsnotify_put_group(struct fsnotify_group *group)
}
/*
* Either finds an existing group which matches the group_num, mask, and ops or
* creates a new group and adds it to the global group list. In either case we
* take a reference for the group returned.
* Create a new fsnotify_group and hold a reference for the group returned.
*/
struct fsnotify_group *fsnotify_obtain_group(__u32 mask,
const struct fsnotify_ops *ops)
struct fsnotify_group *fsnotify_alloc_group(__u32 mask,
const struct fsnotify_ops *ops)
{
struct fsnotify_group *group;
/* very low use, simpler locking if we just always alloc */
group = kzalloc(sizeof(struct fsnotify_group), GFP_KERNEL);
if (!group)
return ERR_PTR(-ENOMEM);
@ -192,7 +189,6 @@ struct fsnotify_group *fsnotify_obtain_group(__u32 mask,
mutex_lock(&fsnotify_grp_mutex);
/* group not found, add a new one */
list_add_rcu(&group->group_list, &fsnotify_groups);
group->on_group_list = 1;
/* being on the fsnotify_groups list holds one num_marks */

2
fs/notify/inotify/inotify_user.c
View File

@ -695,7 +695,7 @@ static struct fsnotify_group *inotify_new_group(struct user_struct *user, unsign
{
struct fsnotify_group *group;
group = fsnotify_obtain_group(0, &inotify_fsnotify_ops);
group = fsnotify_alloc_group(0, &inotify_fsnotify_ops);
if (IS_ERR(group))
return group;

4
include/linux/fsnotify_backend.h
View File

@ -305,11 +305,11 @@ static inline void __fsnotify_d_instantiate(struct dentry *dentry, struct inode
/* must call when a group changes its ->mask */
extern void fsnotify_recalc_global_mask(void);
/* get a reference to an existing or create a new group */
extern struct fsnotify_group *fsnotify_obtain_group(__u32 mask,
extern struct fsnotify_group *fsnotify_alloc_group(__u32 mask,
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_obtain_group */
/* drop reference on a group from fsnotify_alloc_group */
extern void fsnotify_put_group(struct fsnotify_group *group);
/* take a reference to an event */

2
kernel/audit_tree.c
View File

@ -937,7 +937,7 @@ static int __init audit_tree_init(void)
{
int i;
audit_tree_group = fsnotify_obtain_group(0, &audit_tree_ops);
audit_tree_group = fsnotify_alloc_group(0, &audit_tree_ops);
if (IS_ERR(audit_tree_group))
audit_panic("cannot initialize fsnotify group for rectree watches");

4
kernel/audit_watch.c
View File

@ -577,8 +577,8 @@ static const struct fsnotify_ops audit_watch_fsnotify_ops = {
static int __init audit_watch_init(void)
{
audit_watch_group = fsnotify_obtain_group(AUDIT_FS_WATCH,
&audit_watch_fsnotify_ops);
audit_watch_group = fsnotify_alloc_group(AUDIT_FS_WATCH,
&audit_watch_fsnotify_ops);
if (IS_ERR(audit_watch_group)) {
audit_watch_group = NULL;
audit_panic("cannot create audit fsnotify group");