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

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>

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index cf38a345032fd3bc702a99e2b2a12859c5e4a841..24fa3f24b9ad9b805745b8ab5c95296b43c86364 100644 (file)
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -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);

diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index b9370316727e18342f8ea34b7ebd5c8d907e67b3..2188329da3c29e537091d669cf8eee3f0119de98 100644 (file)
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -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.
  */

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 69739b26c7e49a417dd35b939a8164d52826c124..b3b2a464a03cf0ff75d7e3287966578f6fffa2f0 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -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);
 
        }
 

diff --git a/fs/notify/vfsmount_mark.c b/fs/notify/vfsmount_mark.c
index dd5f3fcbccfb7d3e9090ed9c1496208be0f095f0..41bff46576c2739662bef86d3afa6dfd1f6d326f 100644 (file)
--- a/fs/notify/vfsmount_mark.c
+++ b/fs/notify/vfsmount_mark.c
@@ -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

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 63354cd86a7bef191238a9a2047021c29e6b63a7..6d09c6ff9810a78c8ea3bcdbd092179ea256afc1 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -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);