diff options
author | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:39 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:55 -0400 |
commit | 1968f5eed54ce47bde488fd9a450912e4a2d7138 (patch) | |
tree | bcf13b98fda519c240e89cae3de95fc7d9ece715 /kernel/audit_tree.c | |
parent | ce8f76fb7320297ccbe7c950fd9a2d727dd6a5a0 (diff) |
fanotify: use both marks when possible
fanotify currently, when given a vfsmount_mark will look up (if it exists)
the corresponding inode mark. This patch drops that lookup and uses the
mark provided.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r-- | kernel/audit_tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 781ab7f4e35c..7f18d3a4527e 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -921,7 +921,7 @@ static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify | |||
921 | } | 921 | } |
922 | 922 | ||
923 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, | 923 | static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, |
924 | struct vfsmount *mnt, struct fsnotify_mark *inode_mark, | 924 | struct fsnotify_mark *inode_mark, |
925 | struct fsnotify_mark *vfsmount_mark, | 925 | struct fsnotify_mark *vfsmount_mark, |
926 | __u32 mask, void *data, int data_type) | 926 | __u32 mask, void *data, int data_type) |
927 | { | 927 | { |