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

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.

[ coding-style fixes]
Signed-off-by: default avatarLino Sanfilippo <>
Reviewed-by: default avatarJan Kara <>
Cc: Eric Paris <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent a118449a
......@@ -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;
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment