Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c1874c authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by Linus Torvalds
Browse files

fanotify: don't recalculate a marks mask if only the ignored mask changed 



If removing bits from a mark's ignored mask, the concerning
inodes/vfsmounts mask is not affected.  So don't recalculate it.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a118449a

fs/notify/fanotify/fanotify_user.c

+4 −3
Original line number Diff line number Diff line
@@ -487,15 +487,16 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, 
					    unsigned int flags,

					    int *destroy)

{

	__u32 oldmask;

	__u32 oldmask = 0;



	spin_lock(&fsn_mark->lock);

	if (!(flags & FAN_MARK_IGNORED_MASK)) {

		oldmask = fsn_mark->mask;

		fsnotify_set_mark_mask_locked(fsn_mark, (oldmask & ~mask));

	} else {

		oldmask = fsn_mark->ignored_mask;

		fsnotify_set_mark_ignored_mask_locked(fsn_mark, (oldmask & ~mask));

		__u32 tmask = fsn_mark->ignored_mask & ~mask;



		fsnotify_set_mark_ignored_mask_locked(fsn_mark, tmask);

	}

	*destroy = !(fsn_mark->mask | fsn_mark->ignored_mask);

	spin_unlock(&fsn_mark->lock);