diff options
author | Sage Weil <sage@newdream.net> | 2011-05-27 16:42:06 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-28 01:02:52 -0400 |
commit | e3911785b8ae6897b3dae2af4fa296aa5a0f2c56 (patch) | |
tree | f63630445029c6a555a42d3640617f1fa173b960 | |
parent | 4e82d61b6ac4966b3b61c2d97ddf04928f037be1 (diff) |
hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename
hfsplus does not have problems with references to unlinked directories.
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/hfsplus/dir.c | 8 |
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 | } |