2 files changed, 12 insertions, 10 deletions

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 43c307dc9453..bcc0b1821227 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -912,9 +912,11 @@ static void evict_chunk(struct audit_chunk *chunk)
 }
 
 static int audit_tree_handle_event(struct fsnotify_group *group,
+                                   struct inode *to_tell,
                                    struct fsnotify_mark *inode_mark,
-                                   struct fsnotify_mark *vfsmonut_mark,
-                                   struct fsnotify_event *event)
+                                   struct fsnotify_mark *vfsmount_mark,
+                                   u32 mask, void *data, int data_type,
+                                   const unsigned char *file_name)
 {
         BUG();
         return -EOPNOTSUPP;
@@ -945,7 +947,7 @@ static const struct fsnotify_ops audit_tree_ops = {
         .handle_event = audit_tree_handle_event,
         .should_send_event = audit_tree_send_event,
         .free_group_priv = NULL,
-        .free_event_priv = NULL,
+        .free_event = NULL,
         .freeing_mark = audit_tree_freeing_mark,
 };
 
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 22831c4d369c..a760c32cb639 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -475,25 +475,25 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
 
 /* Update watch data in audit rules based on fsnotify events. */
 static int audit_watch_handle_event(struct fsnotify_group *group,
+                                    struct inode *to_tell,
                                     struct fsnotify_mark *inode_mark,
                                     struct fsnotify_mark *vfsmount_mark,
-                                    struct fsnotify_event *event)
+                                    u32 mask, void *data, int data_type,
+                                    const unsigned char *dname)
 {
         struct inode *inode;
-        __u32 mask = event->mask;
-        const char *dname = event->file_name;
         struct audit_parent *parent;
 
         parent = container_of(inode_mark, struct audit_parent, mark);
 
         BUG_ON(group != audit_watch_group);
 
-        switch (event->data_type) {
+        switch (data_type) {
         case (FSNOTIFY_EVENT_PATH):
-                inode = event->path.dentry->d_inode;
+                inode = ((struct path *)data)->dentry->d_inode;
                 break;
         case (FSNOTIFY_EVENT_INODE):
-                inode = event->inode;
+                inode = (struct inode *)data;
                 break;
         default:
                 BUG();
@@ -516,7 +516,7 @@ static const struct fsnotify_ops audit_watch_fsnotify_ops = {
         .handle_event =         audit_watch_handle_event,
         .free_group_priv =      NULL,
         .freeing_mark =         NULL,
-        .free_event_priv =      NULL,
+        .free_event =           NULL,
 };
 
 static int __init audit_watch_init(void)