diff options
Diffstat (limited to 'fs/notify/group.c')
-rw-r--r-- | fs/notify/group.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/notify/group.c b/fs/notify/group.c index ada913fd4f7f..7ac65ed4735b 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c | |||
@@ -90,7 +90,6 @@ void fsnotify_recalc_group_mask(struct fsnotify_group *group) | |||
90 | void fsnotify_add_vfsmount_group(struct fsnotify_group *group) | 90 | void fsnotify_add_vfsmount_group(struct fsnotify_group *group) |
91 | { | 91 | { |
92 | struct fsnotify_group *group_iter; | 92 | struct fsnotify_group *group_iter; |
93 | unsigned int priority = group->priority; | ||
94 | 93 | ||
95 | mutex_lock(&fsnotify_grp_mutex); | 94 | mutex_lock(&fsnotify_grp_mutex); |
96 | 95 | ||
@@ -98,7 +97,7 @@ void fsnotify_add_vfsmount_group(struct fsnotify_group *group) | |||
98 | list_for_each_entry(group_iter, &fsnotify_vfsmount_groups, | 97 | list_for_each_entry(group_iter, &fsnotify_vfsmount_groups, |
99 | vfsmount_group_list) { | 98 | vfsmount_group_list) { |
100 | /* insert in front of this one? */ | 99 | /* insert in front of this one? */ |
101 | if (priority < group_iter->priority) { | 100 | if (group < group_iter) { |
102 | /* list_add_tail() insert in front of group_iter */ | 101 | /* list_add_tail() insert in front of group_iter */ |
103 | list_add_tail_rcu(&group->inode_group_list, | 102 | list_add_tail_rcu(&group->inode_group_list, |
104 | &group_iter->inode_group_list); | 103 | &group_iter->inode_group_list); |
@@ -118,15 +117,14 @@ out: | |||
118 | void fsnotify_add_inode_group(struct fsnotify_group *group) | 117 | void fsnotify_add_inode_group(struct fsnotify_group *group) |
119 | { | 118 | { |
120 | struct fsnotify_group *group_iter; | 119 | struct fsnotify_group *group_iter; |
121 | unsigned int priority = group->priority; | ||
122 | 120 | ||
123 | mutex_lock(&fsnotify_grp_mutex); | 121 | mutex_lock(&fsnotify_grp_mutex); |
124 | 122 | ||
125 | /* add to global group list, priority 0 first, UINT_MAX last */ | 123 | /* add to global group list */ |
126 | if (!group->on_inode_group_list) { | 124 | if (!group->on_inode_group_list) { |
127 | list_for_each_entry(group_iter, &fsnotify_inode_groups, | 125 | list_for_each_entry(group_iter, &fsnotify_inode_groups, |
128 | inode_group_list) { | 126 | inode_group_list) { |
129 | if (priority < group_iter->priority) { | 127 | if (group < group_iter) { |
130 | /* list_add_tail() insert in front of group_iter */ | 128 | /* list_add_tail() insert in front of group_iter */ |
131 | list_add_tail_rcu(&group->inode_group_list, | 129 | list_add_tail_rcu(&group->inode_group_list, |
132 | &group_iter->inode_group_list); | 130 | &group_iter->inode_group_list); |
@@ -260,8 +258,6 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) | |||
260 | spin_lock_init(&group->mark_lock); | 258 | spin_lock_init(&group->mark_lock); |
261 | INIT_LIST_HEAD(&group->marks_list); | 259 | INIT_LIST_HEAD(&group->marks_list); |
262 | 260 | ||
263 | group->priority = UINT_MAX; | ||
264 | |||
265 | group->ops = ops; | 261 | group->ops = ops; |
266 | 262 | ||
267 | return group; | 263 | return group; |