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 /fs/notify/inotify | |
| parent | ce8f76fb7320297ccbe7c950fd9a2d727dd6a5a0 (diff) | |
| download | linux-3.10-1968f5eed54ce47bde488fd9a450912e4a2d7138.tar.gz linux-3.10-1968f5eed54ce47bde488fd9a450912e4a2d7138.tar.bz2 linux-3.10-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 'fs/notify/inotify')
| -rw-r--r-- | fs/notify/inotify/inotify_fsnotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index e53f49731b6..5e73eeb2c69 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c @@ -142,11 +142,11 @@ static void inotify_freeing_mark(struct fsnotify_mark *fsn_mark, struct fsnotify } static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode, - struct vfsmount *mnt, struct fsnotify_mark *mark, + struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { - if ((mark->mask & FS_EXCL_UNLINK) && + if ((inode_mark->mask & FS_EXCL_UNLINK) && (data_type == FSNOTIFY_EVENT_FILE)) { struct file *file = data; |