diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-27 13:42:06 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-28 01:02:52 -0400 |
| commit | e3911785b8ae6897b3dae2af4fa296aa5a0f2c56 (patch) | |
| tree | f63630445029c6a555a42d3640617f1fa173b960 /fs/hfsplus/dir.c | |
| parent | 4e82d61b6ac4966b3b61c2d97ddf04928f037be1 (diff) | |
| download | blackbird-obmc-linux-e3911785b8ae6897b3dae2af4fa296aa5a0f2c56.tar.gz blackbird-obmc-linux-e3911785b8ae6897b3dae2af4fa296aa5a0f2c56.zip | |
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>
Diffstat (limited to 'fs/hfsplus/dir.c')
| -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) 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; } |
