summaryrefslogtreecommitdiffstats
path: root/fs/notify/inotify
diff options
context:
space:
mode:
authorEric Paris2009-06-11 17:09:47 +0200
committerEric Paris2009-06-11 20:57:54 +0200
commite42e27736de80045f925564ea27a1d32957219e7 (patch)
treecae8a5bc81f02c7563625e30f5f0d05357dc3701 /fs/notify/inotify
parentdnotify: do not bother to lock entry->lock when reading mask (diff)
downloadkernel-qcow2-linux-e42e27736de80045f925564ea27a1d32957219e7.tar.gz
kernel-qcow2-linux-e42e27736de80045f925564ea27a1d32957219e7.tar.xz
kernel-qcow2-linux-e42e27736de80045f925564ea27a1d32957219e7.zip
inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD
inotify and dnotify will both indicate that they want any event which came from a child inode. The fix is to mask off FS_EVENT_ON_CHILD when deciding if inotify or dnotify is interested in a given event. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/inotify')
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 160da5486839..7ef75b83247e 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -95,6 +95,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
if (!entry)
return false;
+ mask = (mask & ~FS_EVENT_ON_CHILD);
send = (entry->mask & mask);
/* find took a reference */