fsnotify: rename fsnotify_find_mark_entry to fsnotify_find_mark

the _entry portion of fsnotify functions is useless.  Drop it.

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

2 files changed, 5 insertions, 5 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index f33a9bd32e5d..f8a2a6eda133 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -98,7 +98,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
         to_tell = event->to_tell;
 
         spin_lock(&to_tell->i_lock);
-        entry = fsnotify_find_mark_entry(group, to_tell);
+        entry = fsnotify_find_mark(group, to_tell);
         spin_unlock(&to_tell->i_lock);
         /* race with watch removal?  We already passes should_send */
         if (unlikely(!entry))
@@ -148,7 +148,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
         bool send;
 
         spin_lock(&inode->i_lock);
-        entry = fsnotify_find_mark_entry(group, inode);
+        entry = fsnotify_find_mark(group, inode);
         spin_unlock(&inode->i_lock);
         if (!entry)
                 return false;
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 7be5dcf07ac7..118085c9d2d9 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -567,7 +567,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
                 return -EINVAL;
 
         spin_lock(&inode->i_lock);
-        entry = fsnotify_find_mark_entry(group, inode);
+        entry = fsnotify_find_mark(group, inode);
         spin_unlock(&inode->i_lock);
         if (!entry)
                 return -ENOENT;
@@ -607,7 +607,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
         /* return the wd */
         ret = ientry->wd;
 
-        /* match the get from fsnotify_find_mark_entry() */
+        /* match the get from fsnotify_find_mark() */
         fsnotify_put_mark(entry);
 
         return ret;
@@ -823,7 +823,7 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
 
         ret = 0;
 
-        fsnotify_destroy_mark_by_entry(&ientry->fsn_entry);
+        fsnotify_destroy_mark(&ientry->fsn_entry);
 
         /* match ref taken by inotify_idr_find */
         fsnotify_put_mark(&ientry->fsn_entry);