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

Commit 054c636e authored by Jan Kara's avatar Jan Kara
Browse files

fsnotify: Move ->free_mark callback to fsnotify_ops 



Pointer to ->free_mark callback unnecessarily occupies one long in each
fsnotify_mark although they are the same for all marks from one
notification group. Move the callback pointer to fsnotify_ops.

Reviewed-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 7b129323

fs/notify/dnotify/dnotify.c

+2 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static void dnotify_free_mark(struct fsnotify_mark *fsn_mark) 


static struct fsnotify_ops dnotify_fsnotify_ops = {

	.handle_event = dnotify_handle_event,

	.free_mark = dnotify_free_mark,

};



/*
@@ -305,7 +306,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg) 


	/* set up the new_fsn_mark and new_dn_mark */

	new_fsn_mark = &new_dn_mark->fsn_mark;

	fsnotify_init_mark(new_fsn_mark, dnotify_group, dnotify_free_mark);

	fsnotify_init_mark(new_fsn_mark, dnotify_group);

	new_fsn_mark->mask = mask;

	new_dn_mark->dn = NULL;

fs/notify/fanotify/fanotify.c

+6 −0
Original line number Diff line number Diff line
@@ -262,8 +262,14 @@ static void fanotify_free_event(struct fsnotify_event *fsn_event) 
	kmem_cache_free(fanotify_event_cachep, event);

}



static void fanotify_free_mark(struct fsnotify_mark *fsn_mark)

{

	kmem_cache_free(fanotify_mark_cache, fsn_mark);

}



const struct fsnotify_ops fanotify_fsnotify_ops = {

	.handle_event = fanotify_handle_event,

	.free_group_priv = fanotify_free_group_priv,

	.free_event = fanotify_free_event,

	.free_mark = fanotify_free_mark,

};

fs/notify/fanotify/fanotify.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/path.h>

#include <linux/slab.h>



extern struct kmem_cache *fanotify_mark_cache;

extern struct kmem_cache *fanotify_event_cachep;

extern struct kmem_cache *fanotify_perm_event_cachep;

fs/notify/fanotify/fanotify_user.c

+2 −7
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


extern const struct fsnotify_ops fanotify_fsnotify_ops;



static struct kmem_cache *fanotify_mark_cache __read_mostly;

struct kmem_cache *fanotify_mark_cache __read_mostly;

struct kmem_cache *fanotify_event_cachep __read_mostly;

struct kmem_cache *fanotify_perm_event_cachep __read_mostly;
@@ -445,11 +445,6 @@ static const struct file_operations fanotify_fops = { 
	.llseek		= noop_llseek,

};



static void fanotify_free_mark(struct fsnotify_mark *fsn_mark)

{

	kmem_cache_free(fanotify_mark_cache, fsn_mark);

}



static int fanotify_find_path(int dfd, const char __user *filename,

			      struct path *path, unsigned int flags)

{
@@ -628,7 +623,7 @@ static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group, 
	if (!mark)

		return ERR_PTR(-ENOMEM);



	fsnotify_init_mark(mark, group, fanotify_free_mark);

	fsnotify_init_mark(mark, group);

	ret = fsnotify_add_mark_locked(mark, inode, mnt, 0);

	if (ret) {

		fsnotify_put_mark(mark);

fs/notify/inotify/inotify.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ extern int inotify_handle_event(struct fsnotify_group *group, 
				struct fsnotify_iter_info *iter_info);



extern const struct fsnotify_ops inotify_fsnotify_ops;

extern struct kmem_cache *inotify_inode_mark_cachep;



#ifdef CONFIG_INOTIFY_USER

static inline void dec_inotify_instances(struct ucounts *ucounts)