Commit b601884c authored by Eric Paris's avatar Eric Paris

fsnotify: include data in should_send calls

fanotify is going to need to look at file->private_data to know if an event
should be sent or not.  This passes the data (which might be a file,
dentry, inode, or none) to the should_send function calls so fanotify can
get that information when available
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent ff0cc020
...@@ -133,7 +133,7 @@ static int dnotify_handle_event(struct fsnotify_group *group, ...@@ -133,7 +133,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
*/ */
static bool dnotify_should_send_event(struct fsnotify_group *group, static bool dnotify_should_send_event(struct fsnotify_group *group,
struct inode *inode, __u32 mask, struct inode *inode, __u32 mask,
int data_type) void *data, int data_type)
{ {
struct fsnotify_mark_entry *entry; struct fsnotify_mark_entry *entry;
bool send; bool send;
......
...@@ -156,7 +156,8 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const ...@@ -156,7 +156,8 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const
idx = srcu_read_lock(&fsnotify_grp_srcu); idx = srcu_read_lock(&fsnotify_grp_srcu);
list_for_each_entry_rcu(group, &fsnotify_groups, group_list) { list_for_each_entry_rcu(group, &fsnotify_groups, group_list) {
if (test_mask & group->mask) { if (test_mask & group->mask) {
if (!group->ops->should_send_event(group, to_tell, mask, data_is)) if (!group->ops->should_send_event(group, to_tell, mask,
data, data_is))
continue; continue;
if (!event) { if (!event) {
event = fsnotify_create_event(to_tell, mask, data, event = fsnotify_create_event(to_tell, mask, data,
......
...@@ -86,7 +86,7 @@ static void inotify_freeing_mark(struct fsnotify_mark_entry *entry, struct fsnot ...@@ -86,7 +86,7 @@ static void inotify_freeing_mark(struct fsnotify_mark_entry *entry, struct fsnot
} }
static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode, static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode,
__u32 mask, int data_type) __u32 mask, void *data, int data_type)
{ {
struct fsnotify_mark_entry *entry; struct fsnotify_mark_entry *entry;
bool send; bool send;
......
...@@ -85,7 +85,7 @@ struct fsnotify_event_private_data; ...@@ -85,7 +85,7 @@ struct fsnotify_event_private_data;
*/ */
struct fsnotify_ops { struct fsnotify_ops {
bool (*should_send_event)(struct fsnotify_group *group, struct inode *inode, bool (*should_send_event)(struct fsnotify_group *group, struct inode *inode,
__u32 mask, int data_type); __u32 mask, void *data, int data_type);
int (*handle_event)(struct fsnotify_group *group, struct fsnotify_event *event); int (*handle_event)(struct fsnotify_group *group, struct fsnotify_event *event);
void (*free_group_priv)(struct fsnotify_group *group); void (*free_group_priv)(struct fsnotify_group *group);
void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group); void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group);
......
...@@ -959,7 +959,7 @@ static void audit_tree_freeing_mark(struct fsnotify_mark_entry *entry, struct fs ...@@ -959,7 +959,7 @@ static void audit_tree_freeing_mark(struct fsnotify_mark_entry *entry, struct fs
} }
static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
__u32 mask, int data_type) __u32 mask, void *data, int data_type)
{ {
return 0; return 0;
} }
......
...@@ -505,7 +505,7 @@ void audit_remove_watch_rule(struct audit_krule *krule) ...@@ -505,7 +505,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
} }
static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
__u32 mask, int data_type) __u32 mask, void *data, int data_type)
{ {
struct fsnotify_mark_entry *entry; struct fsnotify_mark_entry *entry;
bool send; bool send;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment