fsnotify: take inode->i_lock inside fsnotify_find_mark_entry()

All callers to fsnotify_find_mark_entry() except one take and
release inode->i_lock around the call.  Take the lock inside
fsnotify_find_mark_entry() instead.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>

2 files changed, 0 insertions, 6 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 12dc72be992e..cc8f6bcbb4a3 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -97,9 +97,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
 
         to_tell = event->to_tell;
 
-        spin_lock(&to_tell->i_lock);
         fsn_mark = fsnotify_find_mark(group, to_tell);
-        spin_unlock(&to_tell->i_lock);
         /* race with watch removal?  We already passes should_send */
         if (unlikely(!fsn_mark))
                 return 0;
@@ -147,9 +145,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
         struct fsnotify_mark *fsn_mark;
         bool send;
 
-        spin_lock(&inode->i_lock);
         fsn_mark = fsnotify_find_mark(group, inode);
-        spin_unlock(&inode->i_lock);
         if (!fsn_mark)
                 return false;
 
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 80d102acb86b..ad5a1ea7827e 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -566,9 +566,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
         if (unlikely(!mask))
                 return -EINVAL;
 
-        spin_lock(&inode->i_lock);
         fsn_mark = fsnotify_find_mark(group, inode);
-        spin_unlock(&inode->i_lock);
         if (!fsn_mark)
                 return -ENOENT;