On Sun 30-11-14 00:37:37, Lino Sanfilippo wrote:
> If removing bits from a marks ignored mask, the concerning inodes/vfsmounts
> mask is not affected. So dont recalculate it.
>
> Signed-off-by: Lino Sanfilippo <LinoSanfilippo@xxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/notify/fanotify/fanotify_user.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
> index 03a0dd1..3afd8bb 100644
> --- a/fs/notify/fanotify/fanotify_user.c
> +++ b/fs/notify/fanotify/fanotify_user.c
> @@ -487,7 +487,7 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark,
> unsigned int flags,
> int *destroy)
> {
> - __u32 oldmask;
> + __u32 oldmask = 0;
> __u32 new_mask;
> __u32 new_ignored;
>
> @@ -496,8 +496,8 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark,
> 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);
> }
> new_mask = fsn_mark->mask;
> new_ignored = fsn_mark->ignored_mask;
> --
> 1.9.1
>
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
