fsnotify: move events should indicate the event was on a child
Subsystems (3)
PATCH 1/4 fsnotify: move events should indicate the event was on a child
fsnotify tells its listeners explicitly when an event happened on the given inode verses on the child of the given inode. (see __fsnotify_parent) However, the semantics of fsnotify_move() are such that we deliver events directly to the two parent directories in question (old_dir and new_dir) directly without using the __fsnotify_parent() call. fsnotify should be adding FS_EVENT_ON_CHILD for the notifications to these parents.
---
include/linux/fsnotify.h | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
include/linux/fsnotify.h +4 -8
@@ -83,12 +83,11 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,struct inode *source = moved->d_inode;u32 in_cookie =inotify_get_cookie ();u32 fs_cookie =fsnotify_get_cookie (); -__u32 old_dir_mask =0 ; -__u32 new_dir_mask =0 ; +__u32 old_dir_mask = (FS_EVENT_ON_CHILD |FS_MOVED_FROM ); +__u32 new_dir_mask = (FS_EVENT_ON_CHILD |FS_MOVED_TO ); -if (old_dir == new_dir) { - old_dir_mask =FS_DN_RENAME ; - } +if (old_dir == new_dir) + old_dir_mask |=FS_DN_RENAME ;if (isdir) { isdir =IN_ISDIR ;
@@ -96,9 +95,6 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, new_dir_mask |=FS_IN_ISDIR ; } - old_dir_mask |=FS_MOVED_FROM ; - new_dir_mask |=FS_MOVED_TO ; -inotify_inode_queue_event (old_dir,IN_MOVED_FROM |isdir, in_cookie, old_name, source); inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, in_cookie, new_name,
PATCH 2/4 dnotify: do not use ?true:false when assigning to a bool
dnotify_should send event assigned a bool using ?true:false when computing a bit operation. This is poitless and the bool type does this for us.
---
fs/notify/dnotify/dnotify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/notify/dnotify/dnotify.c +1 -1
@@ -154,7 +154,7 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,return false;spin_lock (&entry->lock); - send = (mask & entry->mask) ? true : false; + send = (mask & entry->mask);spin_unlock (&entry->lock);fsnotify_put_mark (entry);/* matches fsnotify_find_mark_entry */
PATCH 3/4 dnotify: do not bother to lock entry->lock when reading mask
In reply to Eric Parisentry->lock is needed to make sure entry->mask does not change while manipulating it. In dnotify_should_send_event() we don't care if we get an old or a new mask value out of this entry so there is no point it taking the lock.
---
fs/notify/dnotify/dnotify.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
fs/notify/dnotify/dnotify.c +1 -2
@@ -153,9 +153,8 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,if (!entry)return false; -spin_lock (&entry->lock); send = (mask & entry->mask); -spin_unlock (&entry->lock); +fsnotify_put_mark (entry);/* matches fsnotify_find_mark_entry */ return send;
PATCH 4/4 inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD
In reply to Eric Parisinotify 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.
---
fs/notify/dnotify/dnotify.c | 1 + fs/notify/inotify/inotify_fsnotify.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
fs/notify/dnotify/dnotify.c +1 -0
@@ -153,6 +153,7 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,if (!entry)return false; + mask = (mask & ~FS_EVENT_ON_CHILD ); send = (mask & entry->mask);fsnotify_put_mark (entry);/* matches fsnotify_find_mark_entry */
fs/notify/inotify/inotify_fsnotify.c +1 -0
@@ -95,6 +95,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inodeif (!entry)return false; + mask = (mask & ~FS_EVENT_ON_CHILD ); send = (entry->mask & mask);/* find took a reference */