summaryrefslogtreecommitdiff
path: root/fs/notify/mark.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2017-03-14 16:48:00 +0300
committerJan Kara <jack@suse.cz>2017-04-10 18:37:35 +0300
commite911d8af87dba7642138f4320ca3db80629989f2 (patch)
treef6023831e4d1eae4e99bc4e389012ec70b897b45 /fs/notify/mark.c
parent86ffe245c430f07f95d5d28d3b694ea72f4492e7 (diff)
downloadlinux-e911d8af87dba7642138f4320ca3db80629989f2.tar.xz
fsnotify: Make fsnotify_mark_connector hold inode reference
Currently inode reference is held by fsnotify marks. Change the rules so that inode reference is held by fsnotify_mark_connector structure whenever the list is non-empty. This simplifies the code and is more logical. Reviewed-by: Miklos Szeredi <mszeredi@redhat.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/mark.c')
-rw-r--r--fs/notify/mark.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 3d6e7a8e58be..8a15c64fbe80 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -142,10 +142,9 @@ void fsnotify_detach_mark(struct fsnotify_mark *mark)
mark->flags &= ~FSNOTIFY_MARK_FLAG_ATTACHED;
- if (mark->connector->flags & FSNOTIFY_OBJ_TYPE_INODE) {
- inode = mark->connector->inode;
- fsnotify_destroy_inode_mark(mark);
- } else if (mark->connector->flags & FSNOTIFY_OBJ_TYPE_VFSMOUNT)
+ if (mark->connector->flags & FSNOTIFY_OBJ_TYPE_INODE)
+ inode = fsnotify_destroy_inode_mark(mark);
+ else if (mark->connector->flags & FSNOTIFY_OBJ_TYPE_VFSMOUNT)
fsnotify_destroy_vfsmount_mark(mark);
else
BUG();
@@ -160,7 +159,7 @@ void fsnotify_detach_mark(struct fsnotify_mark *mark)
spin_unlock(&mark->lock);
- if (inode && (mark->flags & FSNOTIFY_MARK_FLAG_OBJECT_PINNED))
+ if (inode)
iput(inode);
atomic_dec(&group->num_marks);
@@ -274,9 +273,6 @@ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
assert_spin_locked(&mark->lock);
mark->mask = mask;
-
- if (mark->connector && mark->connector->flags & FSNOTIFY_OBJ_TYPE_INODE)
- fsnotify_set_inode_mark_mask_locked(mark, mask);
}
void fsnotify_set_mark_ignored_mask_locked(struct fsnotify_mark *mark, __u32 mask)
@@ -375,6 +371,8 @@ int fsnotify_add_mark_list(struct fsnotify_mark_connector **connp,
/* is mark the first mark? */
if (hlist_empty(&conn->list)) {
hlist_add_head_rcu(&mark->obj_list, &conn->list);
+ if (inode)
+ __iget(inode);
goto added;
}
@@ -441,9 +439,6 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark,
} else {
BUG();
}
-
- /* this will pin the object if appropriate */
- fsnotify_set_mark_mask_locked(mark, mark->mask);
spin_unlock(&mark->lock);
if (inode)