Merge tag 'fsnotify_for_v5.7-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (b0c3ba31) · Commits · 戴 / test

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

fs/notify/fanotify/fanotify.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

include/linux/fanotify.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 \| \

Admin message