[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101122175229.GC5512@lsanfilippo.unix.rd.tt.avira.com>
Date: Mon, 22 Nov 2010 18:52:29 +0100
From: Lino Sanfilippo <LinoSanfilippo@....de>
To: eparis@...hat.com
Cc: linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: [PATCH] fanotify: dont destroy mark when ignore mask is cleared
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 <LinoSanfilippo@....de>
---
fs/notify/fanotify/fanotify_user.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Please apply this after patch "Dont allow a mask of 0 if setting or removing a
mark" which i sent today.
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 207cdeb..c9143a0 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -518,7 +518,7 @@ static __u32 fanotify_mark_remove_from_mask(struct fsnotify_mark *fsn_mark,
}
spin_unlock(&fsn_mark->lock);
- if (!(oldmask & ~mask))
+ if (!(flags & FAN_MARK_IGNORED_MASK) && !(oldmask & ~mask))
fsnotify_destroy_mark(fsn_mark);
return mask & oldmask;
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists