Commit 8112e2d6 authored by Eric Paris's avatar Eric Paris
Browse files

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 7b0a04fb

fs/notify/dnotify/dnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int dnotify_handle_event(struct fsnotify_group *group, 
 */

static bool dnotify_should_send_event(struct fsnotify_group *group,

				      struct inode *inode, __u32 mask,

				      int data_type)

				      void *data, int data_type)

{

	struct fsnotify_mark_entry *entry;

	bool send;

fs/notify/fsnotify.c

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const 
	idx = srcu_read_lock(&fsnotify_grp_srcu);

	list_for_each_entry_rcu(group, &fsnotify_groups, group_list) {

		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;

			if (!event) {

				event = fsnotify_create_event(to_tell, mask, data,

fs/notify/inotify/inotify_fsnotify.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,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,

				      __u32 mask, int data_type)

				      __u32 mask, void *data, int data_type)

{

	struct fsnotify_mark_entry *entry;

	bool send;

include/linux/fsnotify_backend.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct fsnotify_event_private_data; 
 */

struct fsnotify_ops {

	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);

	void (*free_group_priv)(struct fsnotify_group *group);

	void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group);

kernel/audit_tree.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,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,

				  __u32 mask, int data_type)

				  __u32 mask, void *data, int data_type)

{

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE