aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/inotify/inotify_fsnotify.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/notify/inotify/inotify_fsnotify.c')
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 1d237e1bf7b1..daa666a6e6c9 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -67,7 +67,9 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *new
67 return false; 67 return false;
68} 68}
69 69
70static int inotify_merge(struct list_head *list, struct fsnotify_event *event) 70static int inotify_merge(struct list_head *list,
71 struct fsnotify_event *event,
72 void **arg)
71{ 73{
72 struct fsnotify_event_holder *last_holder; 74 struct fsnotify_event_holder *last_holder;
73 struct fsnotify_event *last_event; 75 struct fsnotify_event *last_event;
@@ -114,7 +116,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
114 fsn_event_priv->group = group; 116 fsn_event_priv->group = group;
115 event_priv->wd = wd; 117 event_priv->wd = wd;
116 118
117 ret = fsnotify_add_notify_event(group, event, fsn_event_priv, inotify_merge); 119 ret = fsnotify_add_notify_event(group, event, fsn_event_priv, inotify_merge, NULL);
118 if (ret) { 120 if (ret) {
119 inotify_free_event_priv(fsn_event_priv); 121 inotify_free_event_priv(fsn_event_priv);
120 /* EEXIST says we tail matched, EOVERFLOW isn't something 122 /* EEXIST says we tail matched, EOVERFLOW isn't something