Pull fsnotify updates from Jan Kara: - support for FAN_MARK_IGNORE which untangles some of the not well defined corner cases with fanotify ignore masks - small cleanups * tag 'fsnotify_for_v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fsnotify: Fix comment typo fanotify: introduce FAN_MARK_IGNORE fanotify: cleanups for fanotify_mark() input validations fanotify: prepare for setting event flags in ignore mask fs: inotify: Fix typo in inotify comment
Showing the changes to include/uapi (1 of 9 files). Show all
Unified · Split
| @@ -83,12 +83,20 @@ · 82 unmodified lines | |||
| 83 | #define FAN_MARK_FLUSH 0x00000080 | 83 | #define FAN_MARK_FLUSH 0x00000080 |
| 84 | /* FAN_MARK_FILESYSTEM is 0x00000100 */ | 84 | /* FAN_MARK_FILESYSTEM is 0x00000100 */ |
| 85 | #define FAN_MARK_EVICTABLE 0x00000200 | 85 | #define FAN_MARK_EVICTABLE 0x00000200 |
| 86 | /* This bit is mutually exclusive with FAN_MARK_IGNORED_MASK bit */ | ||
| 87 | #define FAN_MARK_IGNORE 0x00000400 | ||
| 86 | 88 | ||
| 87 | /* These are NOT bitwise flags. Both bits can be used togther. */ | 89 | /* These are NOT bitwise flags. Both bits can be used togther. */ |
| 88 | #define FAN_MARK_INODE 0x00000000 | 90 | #define FAN_MARK_INODE 0x00000000 |
| 89 | #define FAN_MARK_MOUNT 0x00000010 | 91 | #define FAN_MARK_MOUNT 0x00000010 |
| 90 | #define FAN_MARK_FILESYSTEM 0x00000100 | 92 | #define FAN_MARK_FILESYSTEM 0x00000100 |
| 91 | 93 | ||
| 94 | /* | ||
| 95 | * Convenience macro - FAN_MARK_IGNORE requires FAN_MARK_IGNORED_SURV_MODIFY | ||
| 96 | * for non-inode mark types. | ||
| 97 | */ | ||
| 98 | #define FAN_MARK_IGNORE_SURV (FAN_MARK_IGNORE | FAN_MARK_IGNORED_SURV_MODIFY) | ||
| 99 | |||
| 92 | /* Deprecated - do not use this in programs and do not add new flags here! */ | 100 | /* Deprecated - do not use this in programs and do not add new flags here! */ |
| 93 | #define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\ | 101 | #define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\ |
| 94 | FAN_MARK_REMOVE |\ | 102 | FAN_MARK_REMOVE |\ |