fsnotify: parent event notification

[deliverable/linux.git] / include / linux / fsnotify.h

diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 3856eb6e597313960ce409c25dd29b5193dca633..6a662ed0bc8ac1d431c17e13f37435ae2f255bbb 100644 (file)
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -23,15 +23,31 @@
 static inline void fsnotify_d_instantiate(struct dentry *entry,
                                                struct inode *inode)
 {
+       __fsnotify_d_instantiate(entry, inode);
+
        inotify_d_instantiate(entry, inode);
 }
 
+/* Notify this dentry's parent about a child's events. */
+static inline void fsnotify_parent(struct dentry *dentry, __u32 mask)
+{
+       __fsnotify_parent(dentry, mask);
+
+       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+}
+
 /*
  * fsnotify_d_move - entry has been moved
  * Called with dcache_lock and entry->d_lock held.
  */
 static inline void fsnotify_d_move(struct dentry *entry)
 {
+       /*
+        * On move we need to update entry->d_flags to indicate if the new parent
+        * cares about events from this entry.
+        */
+       __fsnotify_update_dcache_flags(entry);
+
        inotify_d_move(entry);
 }
 
@@ -117,7 +133,8 @@ static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
        if (isdir)
                mask |= FS_IN_ISDIR;
        dnotify_parent(dentry, DN_DELETE);
-       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
+
+       fsnotify_parent(dentry, mask);
 }
 
 /*
@@ -188,9 +205,9 @@ static inline void fsnotify_access(struct dentry *dentry)
                mask |= FS_IN_ISDIR;
 
        dnotify_parent(dentry, DN_ACCESS);
-       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 
+       fsnotify_parent(dentry, mask);
        fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE);
 }
 
@@ -206,9 +223,9 @@ static inline void fsnotify_modify(struct dentry *dentry)
                mask |= FS_IN_ISDIR;
 
        dnotify_parent(dentry, DN_MODIFY);
-       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 
+       fsnotify_parent(dentry, mask);
        fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE);
 }
 
@@ -223,9 +240,9 @@ static inline void fsnotify_open(struct dentry *dentry)
        if (S_ISDIR(inode->i_mode))
                mask |= FS_IN_ISDIR;
 
-       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 
+       fsnotify_parent(dentry, mask);
        fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE);
 }
 
@@ -236,16 +253,15 @@ static inline void fsnotify_close(struct file *file)
 {
        struct dentry *dentry = file->f_path.dentry;
        struct inode *inode = dentry->d_inode;
-       const char *name = dentry->d_name.name;
        fmode_t mode = file->f_mode;
        __u32 mask = (mode & FMODE_WRITE) ? FS_CLOSE_WRITE : FS_CLOSE_NOWRITE;
 
        if (S_ISDIR(inode->i_mode))
                mask |= FS_IN_ISDIR;
 
-       inotify_dentry_parent_queue_event(dentry, mask, 0, name);
        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 
+       fsnotify_parent(dentry, mask);
        fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE);
 }
 
@@ -260,9 +276,9 @@ static inline void fsnotify_xattr(struct dentry *dentry)
        if (S_ISDIR(inode->i_mode))
                mask |= FS_IN_ISDIR;
 
-       inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 
+       fsnotify_parent(dentry, mask);
        fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE);
 }
 
@@ -311,8 +327,8 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
                if (S_ISDIR(inode->i_mode))
                        in_mask |= FS_IN_ISDIR;
                inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL);
-               inotify_dentry_parent_queue_event(dentry, in_mask, 0,
-                                                 dentry->d_name.name);
+
+               fsnotify_parent(dentry, in_mask);
                fsnotify(inode, in_mask, inode, FSNOTIFY_EVENT_INODE);
        }
 }