Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffab8340 authored by Eric Paris's avatar Eric Paris
Browse files

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: default avatarEric Paris <eparis@redhat.com>
parent cd7752ce

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -433,7 +433,7 @@ static int __init dnotify_init(void) 
	dnotify_struct_cache = KMEM_CACHE(dnotify_struct, SLAB_PANIC);

	dnotify_struct_cache = KMEM_CACHE(dnotify_struct, SLAB_PANIC);

	dnotify_mark_entry_cache = KMEM_CACHE(dnotify_mark_entry, 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))

	if (IS_ERR(dnotify_group))

		panic("unable to allocate fsnotify group for dnotify\n");

		panic("unable to allocate fsnotify group for dnotify\n");

	return 0;

	return 0;

fs/notify/group.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -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

 * Create a new fsnotify_group and hold a reference for the group returned.

 * creates a new group and adds it to the global group list.  In either case we

 * take a reference for the group returned.

 */

 */

struct fsnotify_group *fsnotify_obtain_group(__u32 mask,

struct fsnotify_group *fsnotify_alloc_group(__u32 mask,

					    const struct fsnotify_ops *ops)

					    const struct fsnotify_ops *ops)

{

{

	struct fsnotify_group *group;

	struct fsnotify_group *group;





	/* very low use, simpler locking if we just always alloc */

	group = kzalloc(sizeof(struct fsnotify_group), GFP_KERNEL);

	group = kzalloc(sizeof(struct fsnotify_group), GFP_KERNEL);

	if (!group)

	if (!group)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);
@@ -192,7 +189,6 @@ struct fsnotify_group *fsnotify_obtain_group(__u32 mask, 




	mutex_lock(&fsnotify_grp_mutex);

	mutex_lock(&fsnotify_grp_mutex);





	/* group not found, add a new one */

	list_add_rcu(&group->group_list, &fsnotify_groups);

	list_add_rcu(&group->group_list, &fsnotify_groups);

	group->on_group_list = 1;

	group->on_group_list = 1;

	/* being on the fsnotify_groups list holds one num_marks */

	/* being on the fsnotify_groups list holds one num_marks */

fs/notify/inotify/inotify_user.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -695,7 +695,7 @@ static struct fsnotify_group *inotify_new_group(struct user_struct *user, unsign 
{

{

	struct fsnotify_group *group;

	struct fsnotify_group *group;





	group = fsnotify_obtain_group(0, &inotify_fsnotify_ops);

	group = fsnotify_alloc_group(0, &inotify_fsnotify_ops);

	if (IS_ERR(group))

	if (IS_ERR(group))

		return group;

		return group;

include/linux/fsnotify_backend.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -305,11 +305,11 @@ static inline void __fsnotify_d_instantiate(struct dentry *dentry, struct inode 
/* must call when a group changes its ->mask */

/* must call when a group changes its ->mask */

extern void fsnotify_recalc_global_mask(void);

extern void fsnotify_recalc_global_mask(void);

/* get a reference to an existing or create a new group */

/* 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);

						    const struct fsnotify_ops *ops);

/* run all marks associated with this group and update group->mask */

/* run all marks associated with this group and update group->mask */

extern void fsnotify_recalc_group_mask(struct fsnotify_group *group);

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);

extern void fsnotify_put_group(struct fsnotify_group *group);





/* take a reference to an event */

/* take a reference to an event */

kernel/audit_tree.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -937,7 +937,7 @@ static int __init audit_tree_init(void) 
{

{

	int i;

	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))

	if (IS_ERR(audit_tree_group))

		audit_panic("cannot initialize fsnotify group for rectree watches");

		audit_panic("cannot initialize fsnotify group for rectree watches");