4 files changed, 23 insertions, 16 deletions

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 6624c2ee8786..2cae9be120db 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -83,6 +83,7 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark)
  * events.
  */
 static int dnotify_handle_event(struct fsnotify_group *group,
+                                struct fsnotify_mark *mark,
                                 struct fsnotify_event *event)
 {
         struct fsnotify_mark *fsn_mark = NULL;
@@ -130,7 +131,8 @@ static int dnotify_handle_event(struct fsnotify_group *group,
  */
 static bool dnotify_should_send_event(struct fsnotify_group *group,
                                       struct inode *inode, struct vfsmount *mnt,
-                                      __u32 mask, void *data, int data_type)
+                                      struct fsnotify_mark *mark, __u32 mask,
+                                      void *data, int data_type)
 {
         struct fsnotify_mark *fsn_mark;
         bool send;
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index c2a3029052bc..abfba45abe2c 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -114,7 +114,9 @@ static int fanotify_get_response_from_access(struct fsnotify_group *group,
 }
 #endif
 
-static int fanotify_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
+static int fanotify_handle_event(struct fsnotify_group *group,
+                                 struct fsnotify_mark *mark,
+                                 struct fsnotify_event *event)
 {
         int ret = 0;
         struct fsnotify_event *notify_event = NULL;
@@ -214,8 +216,8 @@ static bool should_send_inode_event(struct fsnotify_group *group, struct inode *
 }
 
 static bool fanotify_should_send_event(struct fsnotify_group *group, struct inode *to_tell,
-                                       struct vfsmount *mnt, __u32 mask, void *data,
-                                       int data_type)
+                                       struct vfsmount *mnt, struct fsnotify_mark *mark,
+                                       __u32 mask, void *data, int data_type)
 {
         pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_type=%d\n",
                  __func__, group, to_tell, mnt, mask, data, data_type);
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 4678b416241e..59d639996cad 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -171,15 +171,16 @@ void __fsnotify_flush_ignored_mask(struct inode *inode, void *data, int data_is)
 }
 
 static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
-                         struct vfsmount *mnt, __u32 mask, void *data,
-                         int data_is, u32 cookie, const unsigned char *file_name,
+                         struct vfsmount *mnt, struct fsnotify_mark *mark,
+                         __u32 mask, void *data, int data_is, u32 cookie,
+                         const unsigned char *file_name,
                          struct fsnotify_event **event)
 {
-        pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_is=%d"
-                 " cookie=%d event=%p\n", __func__, group, to_tell, mnt,
-                 mask, data, data_is, cookie, *event);
+        pr_debug("%s: group=%p to_tell=%p mnt=%p mark=%p mask=%x data=%p"
+                 " data_is=%d cookie=%d event=%p\n", __func__, group, to_tell,
+                 mnt, mark, mask, data, data_is, cookie, *event);
 
-        if (!group->ops->should_send_event(group, to_tell, mnt, mask,
+        if (!group->ops->should_send_event(group, to_tell, mnt, mark, mask,
                                            data, data_is))
                 return 0;
         if (!*event) {
@@ -189,7 +190,7 @@ static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
                 if (!*event)
                         return -ENOMEM;
         }
-        return group->ops->handle_event(group, *event);
+        return group->ops->handle_event(group, mark, *event);
 }
 
 static bool needed_by_vfsmount(__u32 test_mask, struct vfsmount *mnt)
@@ -252,7 +253,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
                                 group = mark->group;
                                 if (!group)
                                         continue;
-                                ret = send_to_group(group, to_tell, NULL, mask,
+                                ret = send_to_group(group, to_tell, NULL, mark, mask,
                                                     data, data_is, cookie, file_name,
                                                     &event);
                                 if (ret)
@@ -271,7 +272,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
                                 group = mark->group;
                                 if (!group)
                                         continue;
-                                ret = send_to_group(group, to_tell, mnt, mask,
+                                ret = send_to_group(group, to_tell, mnt, mark, mask,
                                                     data, data_is, cookie, file_name,
                                                     &event);
                                 if (ret)
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 3c506e0364cc..dbd76bbb3e21 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -89,7 +89,9 @@ static struct fsnotify_event *inotify_merge(struct list_head *list,
         return last_event;
 }
 
-static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
+static int inotify_handle_event(struct fsnotify_group *group,
+                                struct fsnotify_mark *mark,
+                                struct fsnotify_event *event)
 {
         struct fsnotify_mark *fsn_mark;
         struct inotify_inode_mark *i_mark;
@@ -148,8 +150,8 @@ 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, __u32 mask, void *data,
-                                      int data_type)
+                                      struct vfsmount *mnt, struct fsnotify_mark *mark,
+                                      __u32 mask, void *data, int data_type)
 {
         struct fsnotify_mark *fsn_mark;
         bool send;