3 files changed, 9 insertions, 13 deletions

diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index 52f368b6561e..fba78047fb37 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c
@@ -109,7 +109,7 @@ struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pa
         audit_update_mark(audit_mark, dentry->d_inode);
         audit_mark->rule = krule;
 
-        ret = fsnotify_add_mark(&audit_mark->mark, inode, NULL, true);
+        ret = fsnotify_add_inode_mark(&audit_mark->mark, inode, true);
         if (ret < 0) {
                 fsnotify_put_mark(&audit_mark->mark);
                 audit_mark = ERR_PTR(ret);
@@ -165,12 +165,11 @@ static void audit_autoremove_mark_rule(struct audit_fsnotify_mark *audit_mark)
 /* Update mark data in audit rules based on fsnotify events. */
 static int audit_mark_handle_event(struct fsnotify_group *group,
                                     struct inode *to_tell,
-                                    struct fsnotify_mark *inode_mark,
-                                    struct fsnotify_mark *vfsmount_mark,
                                     u32 mask, const void *data, int data_type,
                                     const unsigned char *dname, u32 cookie,
                                     struct fsnotify_iter_info *iter_info)
 {
+        struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
         struct audit_fsnotify_mark *audit_mark;
         const struct inode *inode = NULL;
 
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 67e6956c0b61..c99ebaae5abc 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -288,8 +288,8 @@ static void untag_chunk(struct node *p)
         if (!new)
                 goto Fallback;
 
-        if (fsnotify_add_mark_locked(&new->mark, entry->connector->inode,
-                                     NULL, 1)) {
+        if (fsnotify_add_inode_mark_locked(&new->mark, entry->connector->inode,
+                                           1)) {
                 fsnotify_put_mark(&new->mark);
                 goto Fallback;
         }
@@ -354,7 +354,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)
                 return -ENOMEM;
 
         entry = &chunk->mark;
-        if (fsnotify_add_mark(entry, inode, NULL, 0)) {
+        if (fsnotify_add_inode_mark(entry, inode, 0)) {
                 fsnotify_put_mark(entry);
                 return -ENOSPC;
         }
@@ -434,8 +434,8 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
                 return -ENOENT;
         }
 
-        if (fsnotify_add_mark_locked(chunk_entry,
-                             old_entry->connector->inode, NULL, 1)) {
+        if (fsnotify_add_inode_mark_locked(chunk_entry,
+                             old_entry->connector->inode, 1)) {
                 spin_unlock(&old_entry->lock);
                 mutex_unlock(&old_entry->group->mark_mutex);
                 fsnotify_put_mark(chunk_entry);
@@ -989,8 +989,6 @@ static void evict_chunk(struct audit_chunk *chunk)
 
 static int audit_tree_handle_event(struct fsnotify_group *group,
                                    struct inode *to_tell,
-                                   struct fsnotify_mark *inode_mark,
-                                   struct fsnotify_mark *vfsmount_mark,
                                    u32 mask, const void *data, int data_type,
                                    const unsigned char *file_name, u32 cookie,
                                    struct fsnotify_iter_info *iter_info)
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index f1ba88994508..c17c0c268436 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -160,7 +160,7 @@ static struct audit_parent *audit_init_parent(struct path *path)
 
         fsnotify_init_mark(&parent->mark, audit_watch_group);
         parent->mark.mask = AUDIT_FS_WATCH;
-        ret = fsnotify_add_mark(&parent->mark, inode, NULL, 0);
+        ret = fsnotify_add_inode_mark(&parent->mark, inode, 0);
         if (ret < 0) {
                 audit_free_parent(parent);
                 return ERR_PTR(ret);
@@ -472,12 +472,11 @@ void audit_remove_watch_rule(struct audit_krule *krule)
 /* Update watch data in audit rules based on fsnotify events. */
 static int audit_watch_handle_event(struct fsnotify_group *group,
                                     struct inode *to_tell,
-                                    struct fsnotify_mark *inode_mark,
-                                    struct fsnotify_mark *vfsmount_mark,
                                     u32 mask, const void *data, int data_type,
                                     const unsigned char *dname, u32 cookie,
                                     struct fsnotify_iter_info *iter_info)
 {
+        struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
         const struct inode *inode;
         struct audit_parent *parent;