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>

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 3efb8b9a572d68761389dd3e8ef5b15be5e8ee2d..cac2eb896639f0c16bac1679c723f634c0c51431 100644 (file)
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -95,11 +95,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
 
        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);
-
-       /* unlikely since we alreay passed dnotify_should_send_event() */
        if (unlikely(!fsn_mark))
                return 0;
        dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);
@@ -147,11 +143,7 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,
        if (!S_ISDIR(inode->i_mode))
                return false;
 
-       spin_lock(&inode->i_lock);
        fsn_mark = fsnotify_find_mark(group, inode);
-       spin_unlock(&inode->i_lock);
-
-       /* no mark means no dnotify watch */
        if (!fsn_mark)
                return false;
 
@@ -201,9 +193,7 @@ void dnotify_flush(struct file *filp, fl_owner_t id)
        if (!S_ISDIR(inode->i_mode))
                return;
 
-       spin_lock(&inode->i_lock);
        fsn_mark = fsnotify_find_mark(dnotify_group, inode);
-       spin_unlock(&inode->i_lock);
        if (!fsn_mark)
                return;
        dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);
@@ -356,9 +346,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
        mutex_lock(&dnotify_mark_mutex);
 
        /* add the new_fsn_mark or find an old one. */
-       spin_lock(&inode->i_lock);
        fsn_mark = fsnotify_find_mark(dnotify_group, inode);
-       spin_unlock(&inode->i_lock);
        if (fsn_mark) {
                dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);
                spin_lock(&fsn_mark->lock);

diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index 27c1b43ad739eb307f9a4e327a7624f2f96ec79a..ba6f9833561bf21c538eaeb5bdada5b12874d85e 100644 (file)
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -261,12 +261,8 @@ void fsnotify_clear_marks_by_inode(struct inode *inode)
        }
 }
 
-/*
- * given a group and inode, find the mark associated with that combination.
- * if found take a reference to that mark and return it, else return NULL
- */
-struct fsnotify_mark *fsnotify_find_mark(struct fsnotify_group *group,
-                                        struct inode *inode)
+static struct fsnotify_mark *fsnotify_find_mark_locked(struct fsnotify_group *group,
+                                                      struct inode *inode)
 {
        struct fsnotify_mark *mark;
        struct hlist_node *pos;
@@ -282,6 +278,22 @@ struct fsnotify_mark *fsnotify_find_mark(struct fsnotify_group *group,
        return NULL;
 }
 
+/*
+ * given a group and inode, find the mark associated with that combination.
+ * if found take a reference to that mark and return it, else return NULL
+ */
+struct fsnotify_mark *fsnotify_find_mark(struct fsnotify_group *group,
+                                        struct inode *inode)
+{
+       struct fsnotify_mark *mark;
+
+       spin_lock(&inode->i_lock);
+       mark = fsnotify_find_mark_locked(group, inode);
+       spin_unlock(&inode->i_lock);
+
+       return mark;
+}
+
 void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old)
 {
        assert_spin_locked(&old->lock);
@@ -349,7 +361,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark,
        spin_lock(&inode->i_lock);
 
        if (!allow_dups)
-               lmark = fsnotify_find_mark(group, inode);
+               lmark = fsnotify_find_mark_locked(group, inode);
        if (!lmark) {
                mark->group = group;
                mark->i.inode = inode;

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 12dc72be992ebf38f1a7072f22280e2fdd686d57..cc8f6bcbb4a3ee15dc648b7b563c274cf1aaab81 100644 (file)
--- 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 80d102acb86b9f1dce5c942d3ca4c19bdbe9f215..ad5a1ea7827e48457271b66a702e80f7db127d77 100644 (file)
--- 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;
 

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index b20fb055d7121eddd3569233f6e17c1fc5161958..80f8ac328aad19020d1fc850c48bda46a6277afe 100644 (file)
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -360,9 +360,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
        struct node *p;
        int n;
 
-       spin_lock(&inode->i_lock);
        old_entry = fsnotify_find_mark(audit_tree_group, inode);
-       spin_unlock(&inode->i_lock);
        if (!old_entry)
                return create_chunk(inode, tree);
 

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 24ecbebf43541c2430f9cc8dd9b23d5fa8288c46..d85fa538a722a940fcbea490185cc74b78d4a354 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -101,10 +101,7 @@ static inline struct audit_parent *audit_find_parent(struct inode *inode)
        struct audit_parent *parent = NULL;
        struct fsnotify_mark *entry;
 
-       spin_lock(&inode->i_lock);
        entry = fsnotify_find_mark(audit_watch_group, inode);
-       spin_unlock(&inode->i_lock);
-
        if (entry)
                parent = container_of(entry, struct audit_parent, mark);
 
@@ -520,9 +517,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
        struct fsnotify_mark *entry;
        bool send;
 
-       spin_lock(&inode->i_lock);
        entry = fsnotify_find_mark(group, inode);
-       spin_unlock(&inode->i_lock);
        if (!entry)
                return false;