summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-17 21:24:21 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:31 -0400
commit8112e2d6a7356e8c3ff1f7f3c86f375ed0305705 (patch)
tree953926dd3596c0ac87d7407960d0987b765a8239 /fs
parent7b0a04fbfb35650941af87728d4891515b4fc179 (diff)
downloadop-kernel-dev-8112e2d6a7356e8c3ff1f7f3c86f375ed0305705.zip
op-kernel-dev-8112e2d6a7356e8c3ff1f7f3c86f375ed0305705.tar.gz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/notify/dnotify/dnotify.c2
-rw-r--r--fs/notify/fsnotify.c3
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 6f30f49..a213b83 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,
*/
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 fc06e47..523337b 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
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 fc7c495..1f33234 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
}
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;
OpenPOWER on IntegriCloud