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: Eric Paris <eparis@redhat.com>
This commit is contained in:
parent
7b0a04fbfb
commit
8112e2d6a7
6 changed files with 7 additions and 6 deletions
|
@ -134,7 +134,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;
|
||||||
|
|
|
@ -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);
|
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,
|
||||||
|
|
|
@ -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,
|
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;
|
||||||
*/
|
*/
|
||||||
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);
|
||||||
|
|
|
@ -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,
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -506,7 +506,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;
|
||||||
|
|
Loading…
Add table
Reference in a new issue