Merge tag 'for_v4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (d042a240) · Commits · 戴 / test

Pull fsnotify fix from Jan Kara: "A small fsnotify fix from Amir" * tag 'for_v4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fsnotify: fix ignore mask logic in fsnotify()

fs/notify/fsnotify.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -351,16 +351,9 @@ int fsnotify(struct inode to_tell, __u32 mask, const void data, int data_is,

		iter_info.srcu_idx = srcu_read_lock(&fsnotify_mark_srcu);

		if ((mask & FS_MODIFY) \|\|
		(test_mask & to_tell->i_fsnotify_mask)) {
		iter_info.marks[FSNOTIFY_OBJ_TYPE_INODE] =
		fsnotify_first_mark(&to_tell->i_fsnotify_marks);
		}

		if (mnt && ((mask & FS_MODIFY) \|\|
		(test_mask & mnt->mnt_fsnotify_mask))) {
		iter_info.marks[FSNOTIFY_OBJ_TYPE_INODE] =
		fsnotify_first_mark(&to_tell->i_fsnotify_marks);
		if (mnt) {
		iter_info.marks[FSNOTIFY_OBJ_TYPE_VFSMOUNT] =
		fsnotify_first_mark(&mnt->mnt_fsnotify_marks);
		}