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

Commit b1362edf authored by Jan Kara's avatar Jan Kara
Browse files

fsnotify: Remove fsnotify_find_{inode|vfsmount}_mark() 



These are very thin wrappers, just remove them. Drop
fs/notify/vfsmount_mark.c as it is empty now.

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 2e37c6ca

fs/notify/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_FSNOTIFY)		+= fsnotify.o notification.o group.o inode_mark.o \

				   mark.o vfsmount_mark.o fdinfo.o

				   mark.o fdinfo.o



obj-y			+= dnotify/

obj-y			+= inotify/

fs/notify/dnotify/dnotify.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void dnotify_flush(struct file *filp, fl_owner_t id) 
	if (!S_ISDIR(inode->i_mode))

		return;



	fsn_mark = fsnotify_find_inode_mark(dnotify_group, inode);

	fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, dnotify_group);

	if (!fsn_mark)

		return;

	dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);
@@ -313,7 +313,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg) 
	mutex_lock(&dnotify_group->mark_mutex);



	/* add the new_fsn_mark or find an old one. */

	fsn_mark = fsnotify_find_inode_mark(dnotify_group, inode);

	fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, dnotify_group);

	if (fsn_mark) {

		dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);

		spin_lock(&fsn_mark->lock);

fs/notify/fanotify/fanotify_user.c

+7 −5
Original line number Diff line number Diff line
@@ -533,7 +533,8 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group, 
	int destroy_mark;



	mutex_lock(&group->mark_mutex);

	fsn_mark = fsnotify_find_vfsmount_mark(group, mnt);

	fsn_mark = fsnotify_find_mark(&real_mount(mnt)->mnt_fsnotify_marks,

				      group);

	if (!fsn_mark) {

		mutex_unlock(&group->mark_mutex);

		return -ENOENT;
@@ -562,7 +563,7 @@ static int fanotify_remove_inode_mark(struct fsnotify_group *group, 
	int destroy_mark;



	mutex_lock(&group->mark_mutex);

	fsn_mark = fsnotify_find_inode_mark(group, inode);

	fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group);

	if (!fsn_mark) {

		mutex_unlock(&group->mark_mutex);

		return -ENOENT;
@@ -578,7 +579,7 @@ static int fanotify_remove_inode_mark(struct fsnotify_group *group, 
	if (destroy_mark)

		fsnotify_free_mark(fsn_mark);



	/* matches the fsnotify_find_inode_mark() */

	/* matches the fsnotify_find_mark() */

	fsnotify_put_mark(fsn_mark);



	return 0;
@@ -646,7 +647,8 @@ static int fanotify_add_vfsmount_mark(struct fsnotify_group *group, 
	__u32 added;



	mutex_lock(&group->mark_mutex);

	fsn_mark = fsnotify_find_vfsmount_mark(group, mnt);

	fsn_mark = fsnotify_find_mark(&real_mount(mnt)->mnt_fsnotify_marks,

				      group);

	if (!fsn_mark) {

		fsn_mark = fanotify_add_new_mark(group, NULL, mnt);

		if (IS_ERR(fsn_mark)) {
@@ -683,7 +685,7 @@ static int fanotify_add_inode_mark(struct fsnotify_group *group, 
		return 0;



	mutex_lock(&group->mark_mutex);

	fsn_mark = fsnotify_find_inode_mark(group, inode);

	fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group);

	if (!fsn_mark) {

		fsn_mark = fanotify_add_new_mark(group, inode, NULL);

		if (IS_ERR(fsn_mark)) {

fs/notify/fsnotify.h

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ extern struct srcu_struct fsnotify_mark_srcu; 
extern int fsnotify_compare_groups(struct fsnotify_group *a,

				   struct fsnotify_group *b);



/* Find mark belonging to given group in the list of marks */

extern struct fsnotify_mark *fsnotify_find_mark(

				struct fsnotify_mark_connector __rcu **connp,

				struct fsnotify_group *group);

/* Destroy all marks connected via given connector */

extern void fsnotify_destroy_marks(struct fsnotify_mark_connector __rcu **connp);

/* run the list of all marks associated with inode and destroy them */

fs/notify/inode_mark.c

+0 −10
Original line number Diff line number Diff line
@@ -30,16 +30,6 @@ 


#include "../internal.h"



/*

 * given a group and inode, find the mark associated with that combination.

 * if found take a reference to that mark and return it, else return NULL

 */

struct fsnotify_mark *fsnotify_find_inode_mark(struct fsnotify_group *group,

					       struct inode *inode)

{

	return fsnotify_find_mark(&inode->i_fsnotify_marks, group);

}



/**

 * fsnotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.

 * @sb: superblock being unmounted.