Skip to content

Commit

Permalink
hfsplus: remove unnecessary dentry_unhash on rmdir, dir rename
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
liewegas authored and Al Viro committed May 28, 2011
1 parent 4e82d61 commit e391178
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions fs/hfsplus/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e391178

Please sign in to comment.