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 b017ebbaf3fab87e2709fbe74adb668eff12944f..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);