diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-27 20:03:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-27 20:03:24 +0200 |
| commit | b0c3ba31be3e45a130e13b278cf3b90f69bda6f6 (patch) | |
| tree | 9bf226757e2ff84dcf73b590b3c707a7c2fba30e /fs | |
| parent | Merge branch 'for-5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | fanotify: turn off support for FAN_DIR_MODIFY (diff) | |
| download | linux-b0c3ba31be3e45a130e13b278cf3b90f69bda6f6.tar.xz linux-b0c3ba31be3e45a130e13b278cf3b90f69bda6f6.zip | |
Merge tag 'fsnotify_for_v5.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fanotify FAN_DIR_MODIFY disabling from Jan Kara:
"A single patch that disables FAN_DIR_MODIFY support that was merged in
this merge window.
When discussing further functionality we realized it may be more
logical to guard it with a feature flag or to call things slightly
differently (or maybe not) so let's not set the API in stone for now."
* tag 'fsnotify_for_v5.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fanotify: turn off support for FAN_DIR_MODIFY
Diffstat (limited to 'fs')
| -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 5435a40f82be..c18459cea6f4 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -520,7 +520,7 @@ static int fanotify_handle_event(struct fsnotify_group *group, BUILD_BUG_ON(FAN_OPEN_EXEC != FS_OPEN_EXEC); BUILD_BUG_ON(FAN_OPEN_EXEC_PERM != FS_OPEN_EXEC_PERM); - BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 20); + BUILD_BUG_ON(HWEIGHT32(ALL_FANOTIFY_EVENT_BITS) != 19); mask = fanotify_group_event_mask(group, iter_info, mask, data, data_type); |