diff options
author | Russell King | 2015-04-14 23:28:32 +0200 |
---|---|---|
committer | Russell King | 2015-04-14 23:28:32 +0200 |
commit | 4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch) | |
tree | 5ef3236b354a494c8d71a572896283e44989c696 /fs/notify | |
parent | Merge branches 'misc', 'vdso' and 'fixes' into for-next (diff) | |
parent | ARM: pmu: add support for interrupt-affinity property (diff) | |
download | kernel-qcow2-linux-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.gz kernel-qcow2-linux-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.xz kernel-qcow2-linux-4b2f8838479eb2abe042e094f7d2cced6d5ea772.zip |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'fs/notify')
-rw-r--r-- | fs/notify/fanotify/fanotify.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 9a66ff79ff27..d2f97ecca6a5 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -143,7 +143,8 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark, !(marks_mask & FS_ISDIR & ~marks_ignored_mask)) return false; - if (event_mask & marks_mask & ~marks_ignored_mask) + if (event_mask & FAN_ALL_OUTGOING_EVENTS & marks_mask & + ~marks_ignored_mask) return true; return false; |