From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Paris Subject: Re: [PATCH] fanotify: dont destroy mark when ignore mask is cleared Date: Tue, 23 Nov 2010 14:51:19 -0500 Message-ID: <1290541879.1443.32.camel@localhost.localdomain> References: <20101122175229.GC5512@lsanfilippo.unix.rd.tt.avira.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: Lino Sanfilippo Return-path: In-Reply-To: <20101122175229.GC5512@lsanfilippo.unix.rd.tt.avira.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Mon, 2010-11-22 at 18:52 +0100, Lino Sanfilippo wrote: > In mark_remove_from_mask() the mark is destroyed regardless of whether the > event mask or ignore mask is cleared. We should only destroy the mark if the > event mask is cleared. > > Signed-off-by: Lino Sanfilippo Hmmmm, really I'm not sure if that is right either (but it's certainly closer) What about something like: diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 81df3ad..29fbf17 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -527,7 +527,7 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark, } spin_unlock(&fsn_mark->lock); - if (!(oldmask & ~mask)) + if (!fsn_mark->mask && !fsn_mark->ignored_mask) fsnotify_destroy_mark(fsn_mark); return mask & oldmask;