aboutsummaryrefslogtreecommitdiff
path: root/fs/notify/inode_mark.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-07-28 10:18:38 -0400
committerEric Paris <eparis@redhat.com>2010-07-28 10:18:51 -0400
commit0c6532e4e3b0c8bd18dd0a5cc1894a1944997cc6 (patch)
tree05e9af0efc8018780a45e0c84d8264ceaf359729 /fs/notify/inode_mark.c
parentc1e5c954020e123d30b4abf4038ce501861bcf9f (diff)
downloadlinux-0c6532e4e3b0c8bd18dd0a5cc1894a1944997cc6.tar.gz
fsnotify: place marks on object in order of group memory address
fsnotify_marks currently are placed on objects (inodes or vfsmounts) in arbitrary order. This patch places them in order of the group memory address. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/inode_mark.c')
-rw-r--r--fs/notify/inode_mark.c40
1 files changed, 29 insertions, 11 deletions
diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index 0c0a48b1659..83ce6db3403 100644
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -174,15 +174,17 @@ void fsnotify_set_inode_mark_mask_locked(struct fsnotify_mark *mark,
}
/*
- * Attach an initialized mark to a given group and inode.
+ * Attach an initialized mark to a given inode.
* These marks may be used for the fsnotify backend to determine which
- * event types should be delivered to which group and for which inodes.
+ * event types should be delivered to which group and for which inodes. These
+ * marks are ordered according to the group's location in memory.
*/
int fsnotify_add_inode_mark(struct fsnotify_mark *mark,
struct fsnotify_group *group, struct inode *inode,
int allow_dups)
{
- struct fsnotify_mark *lmark = NULL;
+ struct fsnotify_mark *lmark;
+ struct hlist_node *node, *last = NULL;
int ret = 0;
mark->flags = FSNOTIFY_MARK_FLAG_INODE;
@@ -192,21 +194,37 @@ int fsnotify_add_inode_mark(struct fsnotify_mark *mark,
spin_lock(&inode->i_lock);
- if (!allow_dups)
- lmark = fsnotify_find_inode_mark_locked(group, inode);
- if (!lmark) {
- mark->i.inode = inode;
+ mark->i.inode = inode;
+ /* is mark the first mark? */
+ if (hlist_empty(&inode->i_fsnotify_marks)) {
hlist_add_head(&mark->i.i_list, &inode->i_fsnotify_marks);
+ goto out;
+ }
+
+ /* should mark be in the middle of the current list? */
+ hlist_for_each_entry(lmark, node, &inode->i_fsnotify_marks, i.i_list) {
+ last = node;
+
+ if ((lmark->group == group) && !allow_dups) {
+ ret = -EEXIST;
+ goto out;
+ }
- fsnotify_recalc_inode_mask_locked(inode);
+ if (mark->group < lmark->group)
+ continue;
+
+ hlist_add_before(&mark->i.i_list, &lmark->i.i_list);
+ goto out;
}
+ BUG_ON(last == NULL);
+ /* mark should be the last entry. last is the current last entry */
+ hlist_add_after(last, &mark->i.i_list);
+out:
+ fsnotify_recalc_inode_mask_locked(inode);
spin_unlock(&inode->i_lock);
- if (lmark)
- ret = -EEXIST;
-
return ret;
}