fsnotify: split generic and inode specific mark code

currently all marking is done by functions in inode-mark.c.  Some of this
is pretty generic and should be instead done in a generic function and we
should only put the inode specific code in inode-mark.c

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

2 files changed, 7 insertions, 7 deletions

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 80f8ac328aad..cfb97d752a61 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -259,7 +259,7 @@ static void untag_chunk(struct node *p)
         if (!new)
                 goto Fallback;
         fsnotify_duplicate_mark(&new->mark, entry);
-        if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, 1)) {
+        if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, NULL, 1)) {
                 free_chunk(new);
                 goto Fallback;
         }
@@ -322,7 +322,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)
                 return -ENOMEM;
 
         entry = &chunk->mark;
-        if (fsnotify_add_mark(entry, audit_tree_group, inode, 0)) {
+        if (fsnotify_add_mark(entry, audit_tree_group, inode, NULL, 0)) {
                 free_chunk(chunk);
                 return -ENOSPC;
         }
@@ -360,7 +360,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
         struct node *p;
         int n;
 
-        old_entry = fsnotify_find_mark(audit_tree_group, inode);
+        old_entry = fsnotify_find_inode_mark(audit_tree_group, inode);
         if (!old_entry)
                 return create_chunk(inode, tree);
 
@@ -395,7 +395,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
         }
 
         fsnotify_duplicate_mark(chunk_entry, old_entry);
-        if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, 1)) {
+        if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, NULL, 1)) {
                 spin_unlock(&old_entry->lock);
                 free_chunk(chunk);
                 fsnotify_put_mark(old_entry);
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index d85fa538a722..7499397a6100 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -101,7 +101,7 @@ static inline struct audit_parent *audit_find_parent(struct inode *inode)
         struct audit_parent *parent = NULL;
         struct fsnotify_mark *entry;
 
-        entry = fsnotify_find_mark(audit_watch_group, inode);
+        entry = fsnotify_find_inode_mark(audit_watch_group, inode);
         if (entry)
                 parent = container_of(entry, struct audit_parent, mark);
 
@@ -158,7 +158,7 @@ static struct audit_parent *audit_init_parent(struct nameidata *ndp)
 
         fsnotify_init_mark(&parent->mark, audit_watch_free_mark);
         parent->mark.mask = AUDIT_FS_WATCH;
-        ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode, 0);
+        ret = fsnotify_add_mark(&parent->mark, audit_watch_group, inode, NULL, 0);
         if (ret < 0) {
                 audit_free_parent(parent);
                 return ERR_PTR(ret);
@@ -517,7 +517,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
         struct fsnotify_mark *entry;
         bool send;
 
-        entry = fsnotify_find_mark(group, inode);
+        entry = fsnotify_find_inode_mark(group, inode);
         if (!entry)
                 return false;