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>

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 6f30f496e23529bd727fa08a4a5c54423c501282..a213b83a59cf2b25318a69770e1959339b26eaf1 100644 (file)
--- 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,
  */
 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;

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index fc06e478939285af48cf9a15a87fb779217d14db..523337b600a06f929de6bbb39856a26b88d11b21 100644 (file)
--- 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
        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,

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index fc7c4952e6a2110c989cb0583124a0ddfebb0c54..1f33234cc308620404a9b228c890ab8ae7934c1d 100644 (file)
--- 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
 }
 
 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;

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 61aed0c54fe9edde82a0ee049f9e45da904460fc..2766df67f1ec7b40dfc2c7fe37f154e772d87f4d 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -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);

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index b5417cd65216ebdb13b5f31d5a56bb7571785ee4..e3d63b596ef0b14bb50f421205e157c58598898a 100644 (file)
--- 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
 }
 
 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;
 }

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 67d8f2f52874c215c6be318cef3676e15d7eb2ed..85c43aa292e0b92643890c32bcb1964d631c7c31 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -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,
-                                         __u32 mask, int data_type)
+                                         __u32 mask, void *data, int data_type)
 {
        struct fsnotify_mark_entry *entry;
        bool send;