Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / fs / ocfs2 / namei.c

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index f3582a6a6dac87595d0a3ccad45f0ed4d5c3b9a2..e5d738cd9cc0540d508873818bd0b6035f2c1f20 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -810,9 +810,6 @@ static int ocfs2_unlink(struct inode *dir,
                           (unsigned long long)OCFS2_I(dir)->ip_blkno,
                           (unsigned long long)OCFS2_I(inode)->ip_blkno);
 
-       if (S_ISDIR(inode->i_mode))
-               dentry_unhash(dentry);
-
        dquot_initialize(dir);
 
        BUG_ON(dentry->d_parent->d_inode != dir);
@@ -1066,9 +1063,6 @@ static int ocfs2_rename(struct inode *old_dir,
        struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
        struct ocfs2_dir_lookup_result target_insert = { NULL, };
 
-       if (new_inode && S_ISDIR(new_inode->i_mode))
-               dentry_unhash(new_dentry);
-
        /* At some point it might be nice to break this function up a
         * bit. */