fsnotify: pass both the vfsmount mark and inode mark
should_send_event() and handle_event() will both need to look up the inode
event if they get a vfsmount event. Lets just pass both at the same time
since we have them both after walking the lists in lockstep.
Signed-off-by: Eric Paris <eparis@redhat.com>
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 2abb99f..781ab7f 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -904,7 +904,8 @@
}
static int audit_tree_handle_event(struct fsnotify_group *group,
- struct fsnotify_mark *mark,
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmonut_mark,
struct fsnotify_event *event)
{
BUG();
@@ -920,7 +921,8 @@
}
static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
- struct vfsmount *mnt, struct fsnotify_mark *mark,
+ struct vfsmount *mnt, struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmount_mark,
__u32 mask, void *data, int data_type)
{
return false;
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 1b87e75..a273cf3 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -503,7 +503,8 @@
}
static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
- struct vfsmount *mnt, struct fsnotify_mark *mark,
+ struct vfsmount *mnt, struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmount_mark,
__u32 mask, void *data, int data_type)
{
return true;
@@ -511,7 +512,8 @@
/* Update watch data in audit rules based on fsnotify events. */
static int audit_watch_handle_event(struct fsnotify_group *group,
- struct fsnotify_mark *mark,
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmount_mark,
struct fsnotify_event *event)
{
struct inode *inode;
@@ -519,7 +521,7 @@
const char *dname = event->file_name;
struct audit_parent *parent;
- parent = container_of(mark, struct audit_parent, mark);
+ parent = container_of(inode_mark, struct audit_parent, mark);
BUG_ON(group != audit_watch_group);