From bf927a5d676d23c1983ed019b88d62949abe1808 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Thu, 17 Dec 2009 21:24:33 -0500 Subject: [PATCH] --- yaml --- r: 207687 b: refs/heads/master c: c9778a98e7440fb73e0d27b8155a688663a0d493 h: refs/heads/master i: 207685: b9a5e0e597e29d009e7e75730e7876dd38114f89 207683: 3c57e37564199dc8a5d2f4a39b712155af403346 207679: 652f8c23fe2a2ec3a1823f0e2e8caadb80d74725 v: v3 --- [refs] | 2 +- trunk/fs/notify/fanotify/fanotify_user.c | 2 ++ trunk/include/linux/fanotify.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 695c41120609..f41c8fd0bced 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c908370fc1ac27fd7e1fc0f34c693047b26564ce +refs/heads/master: c9778a98e7440fb73e0d27b8155a688663a0d493 diff --git a/trunk/fs/notify/fanotify/fanotify_user.c b/trunk/fs/notify/fanotify/fanotify_user.c index ad02d475770f..3e275f17e7b7 100644 --- a/trunk/fs/notify/fanotify/fanotify_user.c +++ b/trunk/fs/notify/fanotify/fanotify_user.c @@ -375,6 +375,8 @@ static __u32 fanotify_mark_add_to_mask(struct fsnotify_mark *fsn_mark, } else { oldmask = fsn_mark->ignored_mask; fsnotify_set_mark_ignored_mask_locked(fsn_mark, (oldmask | mask)); + if (flags & FAN_MARK_IGNORED_SURV_MODIFY) + fsn_mark->flags |= FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY; } spin_unlock(&fsn_mark->lock); diff --git a/trunk/include/linux/fanotify.h b/trunk/include/linux/fanotify.h index b8daa9f9b560..e43934d0b74c 100644 --- a/trunk/include/linux/fanotify.h +++ b/trunk/include/linux/fanotify.h @@ -31,13 +31,15 @@ #define FAN_MARK_ONLYDIR 0x00000008 #define FAN_MARK_MOUNT 0x00000010 #define FAN_MARK_IGNORED_MASK 0x00000020 +#define FAN_MARK_IGNORED_SURV_MODIFY 0x00000040 #define FAN_ALL_MARK_FLAGS (FAN_MARK_ADD |\ FAN_MARK_REMOVE |\ FAN_MARK_DONT_FOLLOW |\ FAN_MARK_ONLYDIR |\ FAN_MARK_MOUNT |\ - FAN_MARK_IGNORED_MASK) + FAN_MARK_IGNORED_MASK |\ + FAN_MARK_IGNORED_SURV_MODIFY) /* * All of the events - we build the list by hand so that we can add flags in