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, 4 insertions, 4 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index cc8f6bcbb4a3..1d237e1bf7b1 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -97,7 +97,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
 
         to_tell = event->to_tell;
 
-        fsn_mark = fsnotify_find_mark(group, to_tell);
+        fsn_mark = fsnotify_find_inode_mark(group, to_tell);
         /* race with watch removal?  We already passes should_send */
         if (unlikely(!fsn_mark))
                 return 0;
@@ -145,7 +145,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
         struct fsnotify_mark *fsn_mark;
         bool send;
 
-        fsn_mark = fsnotify_find_mark(group, inode);
+        fsn_mark = fsnotify_find_inode_mark(group, inode);
         if (!fsn_mark)
                 return false;
 
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index ad5a1ea7827e..a12315a7553d 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -566,7 +566,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
         if (unlikely(!mask))
                 return -EINVAL;
 
-        fsn_mark = fsnotify_find_mark(group, inode);
+        fsn_mark = fsnotify_find_inode_mark(group, inode);
         if (!fsn_mark)
                 return -ENOENT;
 
@@ -644,7 +644,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
                 goto out_err;
 
         /* we are on the idr, now get on the inode */
-        ret = fsnotify_add_mark(&tmp_i_mark->fsn_mark, group, inode, 0);
+        ret = fsnotify_add_mark(&tmp_i_mark->fsn_mark, group, inode, NULL, 0);
         if (ret) {
                 /* we failed to get on the inode, get off the idr */
                 inotify_remove_from_idr(group, tmp_i_mark);