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/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index fbd7f35..ef4fa4a 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -115,7 +115,8 @@
#endif
static int fanotify_handle_event(struct fsnotify_group *group,
- struct fsnotify_mark *mark,
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *fanotify_mark,
struct fsnotify_event *event)
{
int ret = 0;
@@ -196,8 +197,11 @@
return true;
}
-static bool fanotify_should_send_event(struct fsnotify_group *group, struct inode *to_tell,
- struct vfsmount *mnt, struct fsnotify_mark *mark,
+static bool fanotify_should_send_event(struct fsnotify_group *group,
+ struct inode *to_tell,
+ struct vfsmount *mnt,
+ struct fsnotify_mark *inode_mark,
+ struct fsnotify_mark *vfsmount_mark,
__u32 mask, void *data, int data_type)
{
pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_type=%d\n",
@@ -213,9 +217,10 @@
return false;
if (mnt)
- return should_send_vfsmount_event(group, mnt, to_tell, mark, mask);
+ return should_send_vfsmount_event(group, mnt, to_tell,
+ vfsmount_mark, mask);
else
- return should_send_inode_event(group, to_tell, mark, mask);
+ return should_send_inode_event(group, to_tell, inode_mark, mask);
}
const struct fsnotify_ops fanotify_fsnotify_ops = {