hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename

[linux-2.6-microblaze.git] / fs / hfsplus / dir.c

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index b288350..4df5059 100644 (file)
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -370,8 +370,6 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
        struct inode *inode = dentry->d_inode;
        int res;
 
-       dentry_unhash(dentry);
-
        if (inode->i_size != 2)
                return -ENOTEMPTY;
 
@@ -469,12 +467,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
 
        /* Unlink destination if it already exists */
        if (new_dentry->d_inode) {
-               if (S_ISDIR(new_dentry->d_inode->i_mode)) {
-                       dentry_unhash(new_dentry);
+               if (S_ISDIR(new_dentry->d_inode->i_mode))
                        res = hfsplus_rmdir(new_dir, new_dentry);
-               } else {
+               else
                        res = hfsplus_unlink(new_dir, new_dentry);
-               }
                if (res)
                        return res;
        }