aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/hfsplus/dir.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index b28835091dd0..4df5059c25da 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -370,8 +370,6 @@ static int hfsplus_rmdir(struct inode *dir, struct dentry *dentry)
370 struct inode *inode = dentry->d_inode; 370 struct inode *inode = dentry->d_inode;
371 int res; 371 int res;
372 372
373 dentry_unhash(dentry);
374
375 if (inode->i_size != 2) 373 if (inode->i_size != 2)
376 return -ENOTEMPTY; 374 return -ENOTEMPTY;
377 375
@@ -469,12 +467,10 @@ static int hfsplus_rename(struct inode *old_dir, struct dentry *old_dentry,
469 467
470 /* Unlink destination if it already exists */ 468 /* Unlink destination if it already exists */
471 if (new_dentry->d_inode) { 469 if (new_dentry->d_inode) {
472 if (S_ISDIR(new_dentry->d_inode->i_mode)) { 470 if (S_ISDIR(new_dentry->d_inode->i_mode))
473 dentry_unhash(new_dentry);
474 res = hfsplus_rmdir(new_dir, new_dentry); 471 res = hfsplus_rmdir(new_dir, new_dentry);
475 } else { 472 else
476 res = hfsplus_unlink(new_dir, new_dentry); 473 res = hfsplus_unlink(new_dir, new_dentry);
477 }
478 if (res) 474 if (res)
479 return res; 475 return res;
480 } 476 }