diff options
-rw-r--r-- | fs/notify/dnotify/dnotify.c | 2 | ||||
-rw-r--r-- | fs/notify/fsnotify.c | 3 | ||||
-rw-r--r-- | fs/notify/inotify/inotify_fsnotify.c | 2 | ||||
-rw-r--r-- | include/linux/fsnotify_backend.h | 2 | ||||
-rw-r--r-- | kernel/audit_tree.c | 2 | ||||
-rw-r--r-- | kernel/audit_watch.c | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index 6f30f496e235..a213b83a59cf 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c | |||
@@ -134,7 +134,7 @@ static int dnotify_handle_event(struct fsnotify_group *group, | |||
134 | */ | 134 | */ |
135 | static bool dnotify_should_send_event(struct fsnotify_group *group, | 135 | static bool dnotify_should_send_event(struct fsnotify_group *group, |
136 | struct inode *inode, __u32 mask, | 136 | struct inode *inode, __u32 mask, |
137 | int data_type) | 137 | void *data, int data_type) |
138 | { | 138 | { |
139 | struct fsnotify_mark_entry *entry; | 139 | struct fsnotify_mark_entry *entry; |
140 | bool send; | 140 | bool send; |
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index fc06e4789392..523337b600a0 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c | |||
@@ -157,7 +157,8 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const | |||
157 | idx = srcu_read_lock(&fsnotify_grp_srcu); | 157 | idx = srcu_read_lock(&fsnotify_grp_srcu); |
158 | list_for_each_entry_rcu(group, &fsnotify_groups, group_list) { | 158 | list_for_each_entry_rcu(group, &fsnotify_groups, group_list) { |
159 | if (test_mask & group->mask) { | 159 | if (test_mask & group->mask) { |
160 | if (!group->ops->should_send_event(group, to_tell, mask, data_is)) | 160 | if (!group->ops->should_send_event(group, to_tell, mask, |
161 | data, data_is)) | ||
161 | continue; | 162 | continue; |
162 | if (!event) { | 163 | if (!event) { |
163 | event = fsnotify_create_event(to_tell, mask, data, | 164 | event = fsnotify_create_event(to_tell, mask, data, |
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index fc7c4952e6a2..1f33234cc308 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c | |||
@@ -87,7 +87,7 @@ static void inotify_freeing_mark(struct fsnotify_mark_entry *entry, struct fsnot | |||
87 | } | 87 | } |
88 | 88 | ||
89 | static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode, | 89 | static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode, |
90 | __u32 mask, int data_type) | 90 | __u32 mask, void *data, int data_type) |
91 | { | 91 | { |
92 | struct fsnotify_mark_entry *entry; | 92 | struct fsnotify_mark_entry *entry; |
93 | bool send; | 93 | bool send; |
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 61aed0c54fe9..2766df67f1ec 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h | |||
@@ -85,7 +85,7 @@ struct fsnotify_event_private_data; | |||
85 | */ | 85 | */ |
86 | struct fsnotify_ops { | 86 | struct fsnotify_ops { |
87 | bool (*should_send_event)(struct fsnotify_group *group, struct inode *inode, | 87 | bool (*should_send_event)(struct fsnotify_group *group, struct inode *inode, |
88 | __u32 mask, int data_type); | 88 | __u32 mask, void *data, int data_type); |
89 | int (*handle_event)(struct fsnotify_group *group, struct fsnotify_event *event); | 89 | int (*handle_event)(struct fsnotify_group *group, struct fsnotify_event *event); |
90 | void (*free_group_priv)(struct fsnotify_group *group); | 90 | void (*free_group_priv)(struct fsnotify_group *group); |
91 | void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group); | 91 | void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group); |
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index b5417cd65216..e3d63b596ef0 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -920,7 +920,7 @@ static void audit_tree_freeing_mark(struct fsnotify_mark_entry *entry, struct fs | |||
920 | } | 920 | } |
921 | 921 | ||
922 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, | 922 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, |
923 | __u32 mask, int data_type) | 923 | __u32 mask, void *data, int data_type) |
924 | { | 924 | { |
925 | return 0; | 925 | return 0; |
926 | } | 926 | } |
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 67d8f2f52874..85c43aa292e0 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c | |||
@@ -506,7 +506,7 @@ void audit_remove_watch_rule(struct audit_krule *krule) | |||
506 | } | 506 | } |
507 | 507 | ||
508 | static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, | 508 | static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, |
509 | __u32 mask, int data_type) | 509 | __u32 mask, void *data, int data_type) |
510 | { | 510 | { |
511 | struct fsnotify_mark_entry *entry; | 511 | struct fsnotify_mark_entry *entry; |
512 | bool send; | 512 | bool send; |