diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2019-01-10 18:04:41 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-02-07 16:38:36 +0100 |
| commit | 0321e03cb4572fb3b56582bcb4927c1fe985b191 (patch) | |
| tree | d1b872b9b848f96c9bde1dd74b5f80a851c4b893 /fs/notify/fanotify | |
| parent | fsnotify: report FS_ISDIR flag with MOVE_SELF and DELETE_SELF events (diff) | |
| download | linux-0321e03cb4572fb3b56582bcb4927c1fe985b191.tar.xz linux-0321e03cb4572fb3b56582bcb4927c1fe985b191.zip | |
fanotify: check FS_ISDIR flag instead of d_is_dir()
All fsnotify hooks set the FS_ISDIR flag for events that happen
on directory victim inodes except for fsnotify_perm().
Add the missing FS_ISDIR flag in fsnotify_perm() hook and let
fanotify_group_event_mask() check the FS_ISDIR flag instead of
checking if path argument is a directory.
This is needed for fanotify support for event types that do not
carry path information.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/fanotify')
| -rw-r--r-- | fs/notify/fanotify/fanotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 555831603637..195fc9fe0150 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -144,7 +144,7 @@ static u32 fanotify_group_event_mask(struct fsnotify_iter_info *iter_info, marks_ignored_mask |= mark->ignored_mask; } - if (d_is_dir(path->dentry) && + if (event_mask & FS_ISDIR && !(marks_mask & FS_ISDIR & ~marks_ignored_mask)) return 0; |