The patch titled
Subject: fanotify: only destroy mark when both mask and ignored_mask are cleared
has been added to the -mm tree. Its filename is
fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Subject: fanotify: only destroy mark when both mask and ignored_mask are cleared
In fanotify_mark_remove_from_mask() a mark is destroyed if only one of
both bitmasks (mask or ignored_mask) of a mark is cleared. However the
other mask may still be set and contain information that should not be
lost. So only destroy a mark if both masks are cleared.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/notify/fanotify/fanotify_user.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN fs/notify/fanotify/fanotify_user.c~fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared fs/notify/fanotify/fanotify_user.c
--- a/fs/notify/fanotify/fanotify_user.c~fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared
+++ a/fs/notify/fanotify/fanotify_user.c
@@ -497,10 +497,9 @@ static __u32 fanotify_mark_remove_from_m
oldmask = fsn_mark->ignored_mask;
fsnotify_set_mark_ignored_mask_locked(fsn_mark, (oldmask & ~mask));
}
+ *destroy = !(fsn_mark->mask | fsn_mark->ignored_mask);
spin_unlock(&fsn_mark->lock);
- *destroy = !(oldmask & ~mask);
-
return mask & oldmask;
}
_
Patches currently in -mm which might be from LinoSanfilippo@xxxxxx are
origin.patch
fanotify-only-destroy-mark-when-both-mask-and-ignored_mask-are-cleared.patch
fanotify-dont-recalculate-a-marks-mask-if-only-the-ignored-mask-changed.patch
fanotify-dont-set-fan_ondir-implicitly-on-a-marks-ignored-mask.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
