aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/audit_watch.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-07-28 10:18:39 -0400
committerEric Paris <eparis@redhat.com>2010-07-28 10:18:55 -0400
commit1968f5eed54ce47bde488fd9a450912e4a2d7138 (patch)
treebcf13b98fda519c240e89cae3de95fc7d9ece715 /kernel/audit_watch.c
parentce8f76fb7320297ccbe7c950fd9a2d727dd6a5a0 (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_watch.c')
-rw-r--r--kernel/audit_watch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index a273cf340527..6bf2306be7d6 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -503,7 +503,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
503} 503}
504 504
505static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, 505static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
506 struct vfsmount *mnt, struct fsnotify_mark *inode_mark, 506 struct fsnotify_mark *inode_mark,
507 struct fsnotify_mark *vfsmount_mark, 507 struct fsnotify_mark *vfsmount_mark,
508 __u32 mask, void *data, int data_type) 508 __u32 mask, void *data, int data_type)
509{ 509{