Merge branch 'akpm' (patches from Andrew Morton)

[~andy/linux] / kernel / audit_tree.c

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 43c307dc9453d5c9166596d2303deaf099cbf5b0..135944a7b28ab901a400d06fd583d831ac8167b9 100644 (file)
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -912,12 +912,13 @@ 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, u32 cookie)
 {
-       BUG();
-       return -EOPNOTSUPP;
+       return 0;
 }
 
 static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group)
@@ -933,19 +934,8 @@ static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify
        BUG_ON(atomic_read(&entry->refcnt) < 1);
 }
 
-static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
-                                 struct fsnotify_mark *inode_mark,
-                                 struct fsnotify_mark *vfsmount_mark,
-                                 __u32 mask, void *data, int data_type)
-{
-       return false;
-}
-
 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,
        .freeing_mark = audit_tree_freeing_mark,
 };