diff options
| author | Eric Paris <eparis@redhat.com> | 2009-12-17 21:24:23 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2010-07-28 09:58:52 -0400 |
| commit | 3a9fb89f4cd04c23e16397befba92efb5d989b74 (patch) | |
| tree | f60b48c8cf488ad8952601ccbc6192b5f86ec900 /kernel | |
| parent | 7131485a93679ff9a543b74df280cfd119eb03ca (diff) | |
fsnotify: include vfsmount in should_send_event when appropriate
To ensure that a group will not duplicate events when it receives it based
on the vfsmount and the inode should_send_event test we should distinguish
those two cases. We pass a vfsmount to this function so groups can make
their own determinations.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit_tree.c | 3 | ||||
| -rw-r--r-- | kernel/audit_watch.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 04f16887406..ecf0bf260d0 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
| @@ -920,7 +920,8 @@ static void audit_tree_freeing_mark(struct fsnotify_mark_entry *entry, struct fs | |||
| 920 | } | 920 | } |
| 921 | 921 | ||
| 922 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, | 922 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, |
| 923 | __u32 mask, void *data, int data_type) | 923 | struct vfsmount *mnt, __u32 mask, void *data, |
| 924 | int data_type) | ||
| 924 | { | 925 | { |
| 925 | return 0; | 926 | return 0; |
| 926 | } | 927 | } |
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 83d5f9674ce..6304ee5d764 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c | |||
| @@ -514,7 +514,8 @@ void audit_remove_watch_rule(struct audit_krule *krule) | |||
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, | 516 | static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, |
| 517 | __u32 mask, void *data, int data_type) | 517 | struct vfsmount *mnt, __u32 mask, void *data, |
| 518 | int data_type) | ||
| 518 | { | 519 | { |
| 519 | struct fsnotify_mark_entry *entry; | 520 | struct fsnotify_mark_entry *entry; |
| 520 | bool send; | 521 | bool send; |
