2 files changed, 5 insertions, 3 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
         return false;
 }
 
-static int inotify_merge(struct list_head *list, struct fsnotify_event *event)
+static int inotify_merge(struct list_head *list,
+                         struct fsnotify_event *event,
+                         void **arg)
 {
         struct fsnotify_event_holder *last_holder;
         struct fsnotify_event *last_event;
@@ -114,7 +116,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
         fsn_event_priv->group = group;
         event_priv->wd = wd;
 
-        ret = fsnotify_add_notify_event(group, event, fsn_event_priv, inotify_merge);
+        ret = fsnotify_add_notify_event(group, event, fsn_event_priv, inotify_merge, NULL);
         if (ret) {
                 inotify_free_event_priv(fsn_event_priv);
                 /* EEXIST says we tail matched, EOVERFLOW isn't something
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 19d274057bfa..1ce71f5b9589 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -525,7 +525,7 @@ void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark,
         fsn_event_priv->group = group;
         event_priv->wd = i_mark->wd;
 
-        ret = fsnotify_add_notify_event(group, ignored_event, fsn_event_priv, NULL);
+        ret = fsnotify_add_notify_event(group, ignored_event, fsn_event_priv, NULL, NULL);
         if (ret)
                 inotify_free_event_priv(fsn_event_priv);