iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD

Browse Source 
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>
This commit is contained in:
Eric Paris 2009-06-11 11:09:47 -04:00
parent ce61856bd2
commit e42e27736d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/notify/dnotify/dnotify.c
View File

@ -153,6 +153,7 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,
if (!entry) if (!entry)
return false; return false;
mask = (mask & ~FS_EVENT_ON_CHILD);
send = (mask & entry->mask); send = (mask & entry->mask);
fsnotify_put_mark(entry); /* matches fsnotify_find_mark_entry */ fsnotify_put_mark(entry); /* matches fsnotify_find_mark_entry */

8
fs/notify/fsnotify.c
View File

@ -137,14 +137,16 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const
struct fsnotify_group *group; struct fsnotify_group *group;
struct fsnotify_event *event = NULL; struct fsnotify_event *event = NULL;
int idx; int idx;
/* global tests shouldn't care about events on child only the specific event */
__u32 test_mask = (mask & ~FS_EVENT_ON_CHILD);
if (list_empty(&fsnotify_groups)) if (list_empty(&fsnotify_groups))
return; return;
if (!(mask & fsnotify_mask)) if (!(test_mask & fsnotify_mask))
return; return;
if (!(mask & to_tell->i_fsnotify_mask)) if (!(test_mask & to_tell->i_fsnotify_mask))
return; return;
/* /*
* SRCU!! the groups list is very very much read only and the path is * SRCU!! the groups list is very very much read only and the path is
@ -153,7 +155,7 @@ void fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, const
*/ */
idx = srcu_read_lock(&fsnotify_grp_srcu); idx = srcu_read_lock(&fsnotify_grp_srcu);
list_for_each_entry_rcu(group, &fsnotify_groups, group_list) { list_for_each_entry_rcu(group, &fsnotify_groups, group_list) {
if (mask & group->mask) { if (test_mask & group->mask) {
if (!group->ops->should_send_event(group, to_tell, mask)) if (!group->ops->should_send_event(group, to_tell, mask))
continue; continue;
if (!event) { if (!event) {

1
fs/notify/inotify/inotify_fsnotify.c
View File

@ -95,6 +95,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
if (!entry) if (!entry)
return false; return false;
mask = (mask & ~FS_EVENT_ON_CHILD);
send = (entry->mask & mask); send = (entry->mask & mask);
/* find took a reference */ /* find took a reference */