korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 14:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Reviewed-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2016-12-21 16:13:54 +01:00
parent 66d2b81bcb
commit 8920d2734d
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/notify/fanotify/fanotify_user.c
View File

@ -542,7 +542,7 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group,
removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags, removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,
&destroy_mark); &destroy_mark);
if (removed & real_mount(mnt)->mnt_fsnotify_mask) 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) if (destroy_mark)
fsnotify_detach_mark(fsn_mark); fsnotify_detach_mark(fsn_mark);
mutex_unlock(&group->mark_mutex); 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, removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,
&destroy_mark); &destroy_mark);
if (removed & inode->i_fsnotify_mask) if (removed & inode->i_fsnotify_mask)
fsnotify_recalc_inode_mask(inode); fsnotify_recalc_mask(inode->i_fsnotify_marks);
if (destroy_mark) if (destroy_mark)
fsnotify_detach_mark(fsn_mark); fsnotify_detach_mark(fsn_mark);
mutex_unlock(&group->mark_mutex); 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); added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);
if (added & ~real_mount(mnt)->mnt_fsnotify_mask) 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); mutex_unlock(&group->mark_mutex);
fsnotify_put_mark(fsn_mark); 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); added = fanotify_mark_add_to_mask(fsn_mark, mask, flags);
if (added & ~inode->i_fsnotify_mask) if (added & ~inode->i_fsnotify_mask)
fsnotify_recalc_inode_mask(inode); fsnotify_recalc_mask(inode->i_fsnotify_marks);
mutex_unlock(&group->mark_mutex); mutex_unlock(&group->mark_mutex);
fsnotify_put_mark(fsn_mark); fsnotify_put_mark(fsn_mark);

5
fs/notify/inode_mark.c
View File

@ -30,11 +30,6 @@
#include "../internal.h" #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. * Given a group clear all of the inode marks associated with that group.
*/ */

2
fs/notify/inotify/inotify_user.c
View File

@ -529,7 +529,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
/* update the inode with this new fsn_mark */ /* update the inode with this new fsn_mark */
if (dropped || do_inode) if (dropped || do_inode)
fsnotify_recalc_inode_mask(inode); fsnotify_recalc_mask(inode->i_fsnotify_marks);
} }

5
fs/notify/vfsmount_mark.c
View File

@ -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); 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. * 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 * if found take a reference to that mark and return it, else return NULL

4
include/linux/fsnotify_backend.h
View File

@ -338,10 +338,6 @@ extern struct fsnotify_event *fsnotify_remove_first_event(struct fsnotify_group
/* Calculate mask of events for a list of marks */ /* Calculate mask of events for a list of marks */
extern void fsnotify_recalc_mask(struct fsnotify_mark_connector *conn); 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)); 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 */ /* 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); extern struct fsnotify_mark *fsnotify_find_inode_mark(struct fsnotify_group *group, struct inode *inode);