History

Merge tag 'fsnotify_for_v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull fanotify updates from Jan Kara: "Support for new FAN_RENAME fanotify event and support for reporting child info in directory fanotify events (FAN_REPORT_TARGET_FID)" * tag 'fsnotify_for_v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fanotify: wire up FAN_RENAME event fanotify: report old and/or new parent+name in FAN_RENAME event fanotify: record either old name new name or both for FAN_RENAME fanotify: record old and new parent and name in FAN_RENAME event fanotify: support secondary dir fh and name in fanotify_info fanotify: use helpers to parcel fanotify_info buffer fanotify: use macros to get the offset to fanotify_info buffer fsnotify: generate FS_RENAME event with rich information fanotify: introduce group flag FAN_REPORT_TARGET_FID fsnotify: separate mark iterator type from object type enum fsnotify: clarify object type argument

Linus Torvalds committed 4 years ago

Commit 3d3d6732 parents f079ab0 8cc3b1c12 files · +483 −144Browse files

Showing the changes to include/uapi/linux (1 of 12 files). Show all

Unified · Split

include/uapi/linux/fanotify.h+12−0
@@ -28,6 +28,8 @@ · 27 unmodified lines
2828
2929 #define FAN_EVENT_ON_CHILD 0x08000000 /* Interested in child events */
3030
31+#define FAN_RENAME 0x10000000 /* File was renamed */
32+
3133 #define FAN_ONDIR 0x40000000 /* Event occurred against dir */
3234
3335 /* helper events */
@@ -57,9 +59,13 @@ · 23 unmodified lines
5759 #define FAN_REPORT_FID 0x00000200 /* Report unique file id */
5860 #define FAN_REPORT_DIR_FID 0x00000400 /* Report unique directory id */
5961 #define FAN_REPORT_NAME 0x00000800 /* Report events with name */
62+#define FAN_REPORT_TARGET_FID 0x00001000 /* Report dirent target id */
6063
6164 /* Convenience macro - FAN_REPORT_NAME requires FAN_REPORT_DIR_FID */
6265 #define FAN_REPORT_DFID_NAME (FAN_REPORT_DIR_FID | FAN_REPORT_NAME)
66+/* Convenience macro - FAN_REPORT_TARGET_FID requires all other FID flags */
67+#define FAN_REPORT_DFID_NAME_TARGET (FAN_REPORT_DFID_NAME | \
68+ FAN_REPORT_FID | FAN_REPORT_TARGET_FID)
6369
6470 /* Deprecated - do not use this in programs and do not add new flags here! */
6571 #define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | \
@@ -128,6 +134,12 @@ struct fanotify_event_metadata { · 62 unmodified lines
128134 #define FAN_EVENT_INFO_TYPE_PIDFD 4
129135 #define FAN_EVENT_INFO_TYPE_ERROR 5
130136
137+/* Special info types for FAN_RENAME */
138+#define FAN_EVENT_INFO_TYPE_OLD_DFID_NAME 10
139+/* Reserved for FAN_EVENT_INFO_TYPE_OLD_DFID 11 */
140+#define FAN_EVENT_INFO_TYPE_NEW_DFID_NAME 12
141+/* Reserved for FAN_EVENT_INFO_TYPE_NEW_DFID 13 */
142+
131143 /* Variable length info record following event metadata */
132144 struct fanotify_event_info_header {
133145 __u8 info_type;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t