aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/notification.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/notify/notification.c')
-rw-r--r--fs/notify/notification.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index 7fc8d004084c..2d50a40ab1e4 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -137,7 +137,10 @@ struct fsnotify_event_private_data *fsnotify_remove_priv_from_event(struct fsnot
137 */ 137 */
138int fsnotify_add_notify_event(struct fsnotify_group *group, struct fsnotify_event *event, 138int fsnotify_add_notify_event(struct fsnotify_group *group, struct fsnotify_event *event,
139 struct fsnotify_event_private_data *priv, 139 struct fsnotify_event_private_data *priv,
140 int (*merge)(struct list_head *, struct fsnotify_event *)) 140 int (*merge)(struct list_head *,
141 struct fsnotify_event *,
142 void **arg),
143 void **arg)
141{ 144{
142 struct fsnotify_event_holder *holder = NULL; 145 struct fsnotify_event_holder *holder = NULL;
143 struct list_head *list = &group->notification_list; 146 struct list_head *list = &group->notification_list;
@@ -170,7 +173,7 @@ alloc_holder:
170 if (!list_empty(list) && merge) { 173 if (!list_empty(list) && merge) {
171 int ret; 174 int ret;
172 175
173 ret = merge(list, event); 176 ret = merge(list, event, arg);
174 if (ret) { 177 if (ret) {
175 mutex_unlock(&group->notification_mutex); 178 mutex_unlock(&group->notification_mutex);
176 if (holder != &event->holder) 179 if (holder != &event->holder)