On Thu 04-12-14 05:43:02, Lino Sanfilippo wrote: > 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> Looks good you can add: Reviewed-by: Jan Kara <jack@xxxxxxx> BTW: Andrew Morton merges notification patches these days so please post the patches again with reviewed-by tags and CC him as well to make it easier for him to pick them up. Honza > --- > fs/notify/fanotify/fanotify_user.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c > index c991616..ba31055 100644 > --- a/fs/notify/fanotify/fanotify_user.c > +++ b/fs/notify/fanotify/fanotify_user.c > @@ -497,10 +497,9 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, > 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; > } > > -- > 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
