diff options
| author | Eric Paris | 2010-07-28 16:18:39 +0200 |
|---|---|---|
| committer | Eric Paris | 2010-07-28 16:18:55 +0200 |
| commit | 1968f5eed54ce47bde488fd9a450912e4a2d7138 (patch) | |
| tree | bcf13b98fda519c240e89cae3de95fc7d9ece715 /kernel | |
| parent | fsnotify: pass both the vfsmount mark and inode mark (diff) | |
| download | kernel-qcow2-linux-1968f5eed54ce47bde488fd9a450912e4a2d7138.tar.gz kernel-qcow2-linux-1968f5eed54ce47bde488fd9a450912e4a2d7138.tar.xz kernel-qcow2-linux-1968f5eed54ce47bde488fd9a450912e4a2d7138.zip | |
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')
| -rw-r--r-- | kernel/audit_tree.c | 2 | ||||
| -rw-r--r-- | kernel/audit_watch.c | 2 |
2 files changed, 2 insertions, 2 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 } static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode, - struct vfsmount *mnt, struct fsnotify_mark *inode_mark, + struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { 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) } static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode, - struct vfsmount *mnt, struct fsnotify_mark *inode_mark, + struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { |