fsnotify: simplify arguments passing to fsnotify_parent()

[linux-2.6-microblaze.git] / fs / notify / fsnotify.c

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index a5d6467..193530f 100644 (file)
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -143,15 +143,13 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode)
 }
 
 /* Notify this dentry's parent about a child's events. */
-int __fsnotify_parent(const struct path *path, struct dentry *dentry, __u32 mask)
+int fsnotify_parent(struct dentry *dentry, __u32 mask, const void *data,
+                   int data_type)
 {
        struct dentry *parent;
        struct inode *p_inode;
        int ret = 0;
 
-       if (!dentry)
-               dentry = path->dentry;
-
        if (!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED))
                return 0;
 
@@ -168,12 +166,7 @@ int __fsnotify_parent(const struct path *path, struct dentry *dentry, __u32 mask
                mask |= FS_EVENT_ON_CHILD;
 
                take_dentry_name_snapshot(&name, dentry);
-               if (path)
-                       ret = fsnotify(p_inode, mask, path, FSNOTIFY_EVENT_PATH,
-                                      &name.name, 0);
-               else
-                       ret = fsnotify(p_inode, mask, dentry->d_inode, FSNOTIFY_EVENT_INODE,
-                                      &name.name, 0);
+               ret = fsnotify(p_inode, mask, data, data_type, &name.name, 0);
                release_dentry_name_snapshot(&name);
        }
 
@@ -181,7 +174,7 @@ int __fsnotify_parent(const struct path *path, struct dentry *dentry, __u32 mask
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(__fsnotify_parent);
+EXPORT_SYMBOL_GPL(fsnotify_parent);
 
 static int send_to_group(struct inode *to_tell,
                         __u32 mask, const void *data,