diff options
author | Jan Kara <jack@suse.cz> | 2014-01-21 18:48:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 19:19:41 -0500 |
commit | 83c4c4b0a3aadc1ce7b5b2870ce1fc1f65498da0 (patch) | |
tree | a195ea785bb03a301773930f62d3fa45927be10d /kernel/audit_tree.c | |
parent | 7053aee26a3548ebaba046ae2e52396ccf56ac6c (diff) |
fsnotify: remove .should_send_event callback
After removing event structure creation from the generic layer there is
no reason for separate .should_send_event and .handle_event callbacks.
So just remove the first one.
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Eric Paris <eparis@parisplace.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r-- | kernel/audit_tree.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index bcc0b1821227..ae8103b057fa 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -918,8 +918,7 @@ static int audit_tree_handle_event(struct fsnotify_group *group, | |||
918 | u32 mask, void *data, int data_type, | 918 | u32 mask, void *data, int data_type, |
919 | const unsigned char *file_name) | 919 | const unsigned char *file_name) |
920 | { | 920 | { |
921 | BUG(); | 921 | return 0; |
922 | return -EOPNOTSUPP; | ||
923 | } | 922 | } |
924 | 923 | ||
925 | static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group) | 924 | static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group) |
@@ -935,17 +934,8 @@ static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify | |||
935 | BUG_ON(atomic_read(&entry->refcnt) < 1); | 934 | BUG_ON(atomic_read(&entry->refcnt) < 1); |
936 | } | 935 | } |
937 | 936 | ||
938 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, | ||
939 | struct fsnotify_mark *inode_mark, | ||
940 | struct fsnotify_mark *vfsmount_mark, | ||
941 | __u32 mask, void *data, int data_type) | ||
942 | { | ||
943 | return false; | ||
944 | } | ||
945 | |||
946 | static const struct fsnotify_ops audit_tree_ops = { | 937 | static const struct fsnotify_ops audit_tree_ops = { |
947 | .handle_event = audit_tree_handle_event, | 938 | .handle_event = audit_tree_handle_event, |
948 | .should_send_event = audit_tree_send_event, | ||
949 | .free_group_priv = NULL, | 939 | .free_group_priv = NULL, |
950 | .free_event = NULL, | 940 | .free_event = NULL, |
951 | .freeing_mark = audit_tree_freeing_mark, | 941 | .freeing_mark = audit_tree_freeing_mark, |