Commit 103ff6a5 authored by Amir Goldstein's avatar Amir Goldstein Committed by Jan Kara
Browse files

fanotify: generalize merge logic of events on dir 

An event on directory should never be merged with an event on
non-directory regardless of the event struct type.

This change has no visible effect, because currently, with struct
fanotify_path_event, the relevant events will not be merged because
event path of dir will be different than event path of non-dir.

Link: https://lore.kernel.org/r/20200716084230.30611-3-amir73il@gmail.com


Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 0badfa02

fs/notify/fanotify/fanotify.c

+11 −11
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ static bool fanotify_should_merge(struct fsnotify_event *old_fsn, 
	    old->type != new->type || old->pid != new->pid)

		return false;



	switch (old->type) {

	case FANOTIFY_EVENT_TYPE_PATH:

		return fanotify_path_equal(fanotify_event_path(old),

					   fanotify_event_path(new));

	case FANOTIFY_EVENT_TYPE_FID:

	/*

	 * We want to merge many dirent events in the same dir (i.e.

	 * creates/unlinks/renames), but we do not want to merge dirent
@@ -99,6 +94,11 @@ static bool fanotify_should_merge(struct fsnotify_event *old_fsn, 
	if ((old->mask & FS_ISDIR) != (new->mask & FS_ISDIR))

		return false;



	switch (old->type) {

	case FANOTIFY_EVENT_TYPE_PATH:

		return fanotify_path_equal(fanotify_event_path(old),

					   fanotify_event_path(new));

	case FANOTIFY_EVENT_TYPE_FID:

		return fanotify_fid_event_equal(FANOTIFY_FE(old),

						FANOTIFY_FE(new));

	case FANOTIFY_EVENT_TYPE_FID_NAME: