fanotify: use both marks when possible

fanotify currently, when given a vfsmount_mark will look up (if it exists)
the corresponding inode mark.  This patch drops that lookup and uses the
mark provided.

Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index e53f49731b6e..5e73eeb2c697 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -142,11 +142,11 @@ static void inotify_freeing_mark(struct fsnotify_mark *fsn_mark, struct fsnotify
 }
 
 static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode,
-                                      struct vfsmount *mnt, struct fsnotify_mark *mark,
+                                      struct fsnotify_mark *inode_mark,
                                       struct fsnotify_mark *vfsmount_mark,
                                       __u32 mask, void *data, int data_type)
 {
-        if ((mark->mask & FS_EXCL_UNLINK) &&
+        if ((inode_mark->mask & FS_EXCL_UNLINK) &&
             (data_type == FSNOTIFY_EVENT_FILE)) {
                 struct file *file  = data;