diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-27 21:03:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-27 21:03:24 +0300 |
| commit | b0c3ba31be3e45a130e13b278cf3b90f69bda6f6 (patch) | |
| tree | 9bf226757e2ff84dcf73b590b3c707a7c2fba30e /include | |
| parent | 3301f6ae2d4cb396ae0c103329a5680d14f7a5c6 (diff) | |
| parent | f17936993af054b16725d0c54baa58115f9e052a (diff) | |
| download | linux-b0c3ba31be3e45a130e13b278cf3b90f69bda6f6.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/fanotify.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h index 3049a6c06d9e..b79fa9bb7359 100644 --- a/include/linux/fanotify.h +++ b/include/linux/fanotify.h @@ -47,8 +47,7 @@ * Directory entry modification events - reported only to directory * where entry is modified and not to a watching parent. */ -#define FANOTIFY_DIRENT_EVENTS (FAN_MOVE | FAN_CREATE | FAN_DELETE | \ - FAN_DIR_MODIFY) +#define FANOTIFY_DIRENT_EVENTS (FAN_MOVE | FAN_CREATE | FAN_DELETE) /* Events that can only be reported with data type FSNOTIFY_EVENT_INODE */ #define FANOTIFY_INODE_EVENTS (FANOTIFY_DIRENT_EVENTS | \ |