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

Commit 0d2e2a1d authored by Eric Paris's avatar Eric Paris
Browse files

fsnotify: drop mask argument from fsnotify_alloc_group 



Nothing uses the mask argument to fsnotify_alloc_group.  This patch drops
that argument.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 220d14df

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_alloc_group(0, &dnotify_fsnotify_ops);

	dnotify_group = fsnotify_alloc_group(&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

+1 −7
Original line number Original line Diff line number Diff line
@@ -164,8 +164,7 @@ void fsnotify_put_group(struct fsnotify_group *group) 
/*

/*

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

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

 */

 */

struct fsnotify_group *fsnotify_alloc_group(__u32 mask,

struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)

					    const struct fsnotify_ops *ops)

{

{

	struct fsnotify_group *group;

	struct fsnotify_group *group;
@@ -175,8 +174,6 @@ struct fsnotify_group *fsnotify_alloc_group(__u32 mask, 




	atomic_set(&group->refcnt, 1);

	atomic_set(&group->refcnt, 1);





	group->mask = mask;



	mutex_init(&group->notification_mutex);

	mutex_init(&group->notification_mutex);

	INIT_LIST_HEAD(&group->notification_list);

	INIT_LIST_HEAD(&group->notification_list);

	init_waitqueue_head(&group->notification_waitq);

	init_waitqueue_head(&group->notification_waitq);
@@ -196,8 +193,5 @@ struct fsnotify_group *fsnotify_alloc_group(__u32 mask, 




	mutex_unlock(&fsnotify_grp_mutex);

	mutex_unlock(&fsnotify_grp_mutex);





	if (mask)

		fsnotify_recalc_global_mask();



	return group;

	return group;

}
 
}

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_alloc_group(0, &inotify_fsnotify_ops);

	group = fsnotify_alloc_group(&inotify_fsnotify_ops);

	if (IS_ERR(group))

	if (IS_ERR(group))

		return group;

		return group;

include/linux/fsnotify_backend.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -305,8 +305,7 @@ 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_alloc_group(__u32 mask,

extern struct fsnotify_group *fsnotify_alloc_group(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_alloc_group */

/* drop reference on a group from fsnotify_alloc_group */

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_alloc_group(0, &audit_tree_ops);

	audit_tree_group = fsnotify_alloc_group(&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");