Merge with /shiny/git/linux-2.6/.git

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/namei.c b/fs/namei.c
index e252b12d39be..264e232addda 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1801,7 +1801,6 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
         }
         up(&dentry->d_inode->i_sem);
         if (!error) {
-                fsnotify_rmdir(dentry, dentry->d_inode, dir);
                 d_delete(dentry);
         }
         dput(dentry);
@@ -1874,7 +1873,6 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
 
         /* We don't d_delete() NFS sillyrenamed files--they still exist. */
         if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
-                fsnotify_unlink(dentry, dir);
                 d_delete(dentry);
         }
 
@@ -2218,7 +2216,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
         if (!error) {
                 const char *new_name = old_dentry->d_name.name;
-                fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir);
+                fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, new_dentry->d_inode);
         }
         fsnotify_oldname_free(old_name);