Commit 8920d273 authored by Jan Kara's avatar Jan Kara
Browse files

fsnotify: Remove fsnotify_recalc_{inode|vfsmount}_mask() 



These helpers are just very thin wrappers now. Remove them.

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 66d2b81b

fs/notify/fanotify/fanotify_user.c

+4 −4
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group, 
	removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,

						 &destroy_mark);

	if (removed & real_mount(mnt)->mnt_fsnotify_mask)

		fsnotify_recalc_vfsmount_mask(mnt);

		fsnotify_recalc_mask(real_mount(mnt)->mnt_fsnotify_marks);

	if (destroy_mark)

		fsnotify_detach_mark(fsn_mark);

	mutex_unlock(&group->mark_mutex);
@@ -571,7 +571,7 @@ static int fanotify_remove_inode_mark(struct fsnotify_group *group, 
	removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,

						 &destroy_mark);

	if (removed & inode->i_fsnotify_mask)

		fsnotify_recalc_inode_mask(inode);

		fsnotify_recalc_mask(inode->i_fsnotify_marks);

	if (destroy_mark)

		fsnotify_detach_mark(fsn_mark);

	mutex_unlock(&group->mark_mutex);
@@ -656,7 +656,7 @@ static int fanotify_add_vfsmount_mark(struct fsnotify_group *group, 
	}

	added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);

	if (added & ~real_mount(mnt)->mnt_fsnotify_mask)

		fsnotify_recalc_vfsmount_mask(mnt);

		fsnotify_recalc_mask(real_mount(mnt)->mnt_fsnotify_marks);

	mutex_unlock(&group->mark_mutex);



	fsnotify_put_mark(fsn_mark);
@@ -693,7 +693,7 @@ static int fanotify_add_inode_mark(struct fsnotify_group *group, 
	}

	added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);

	if (added & ~inode->i_fsnotify_mask)

		fsnotify_recalc_inode_mask(inode);

		fsnotify_recalc_mask(inode->i_fsnotify_marks);

	mutex_unlock(&group->mark_mutex);



	fsnotify_put_mark(fsn_mark);

fs/notify/inode_mark.c

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 


#include "../internal.h"



void fsnotify_recalc_inode_mask(struct inode *inode)

{

	fsnotify_recalc_mask(inode->i_fsnotify_marks);

}



/*

 * Given a group clear all of the inode marks associated with that group.

 */

fs/notify/inotify/inotify_user.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group, 


		/* update the inode with this new fsn_mark */

		if (dropped || do_inode)

			fsnotify_recalc_inode_mask(inode);

			fsnotify_recalc_mask(inode->i_fsnotify_marks);



	}

fs/notify/vfsmount_mark.c

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ void fsnotify_clear_vfsmount_marks_by_group(struct fsnotify_group *group) 
	fsnotify_clear_marks_by_group_flags(group, FSNOTIFY_OBJ_TYPE_VFSMOUNT);

}



void fsnotify_recalc_vfsmount_mask(struct vfsmount *mnt)

{

	fsnotify_recalc_mask(real_mount(mnt)->mnt_fsnotify_marks);

}



/*

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

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

include/linux/fsnotify_backend.h

+0 −4
Original line number Diff line number Diff line
@@ -338,10 +338,6 @@ extern struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group 


/* Calculate mask of events for a list of marks */

extern void fsnotify_recalc_mask(struct fsnotify_mark_connector *conn);

/* run all marks associated with a vfsmount and update mnt->mnt_fsnotify_mask */

extern void fsnotify_recalc_vfsmount_mask(struct vfsmount *mnt);

/* run all marks associated with an inode and update inode->i_fsnotify_mask */

extern void fsnotify_recalc_inode_mask(struct inode *inode);

extern void fsnotify_init_mark(struct fsnotify_mark *mark, void (*free_mark)(struct fsnotify_mark *mark));

/* find (and take a reference) to a mark associated with group and inode */

extern struct fsnotify_mark *fsnotify_find_inode_mark(struct fsnotify_group *group, struct inode *inode);