summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 13:42:05 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:52 -0400
commit4e82d61b6ac4966b3b61c2d97ddf04928f037be1 (patch)
tree3700b906aa42f7f1a41656cdfdae9245c9a618fa /fs
parent8aaa0f5431d8d1181b3d1a1bcd8f3330c0ce275f (diff)
downloadlwn-4e82d61b6ac4966b3b61c2d97ddf04928f037be1.tar.gz
lwn-4e82d61b6ac4966b3b61c2d97ddf04928f037be1.zip
hfs: remove unnecessary dentry_unhash on rmdir, dir rename
hfs 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')
-rw-r--r--fs/hfs/dir.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 1cb70cdba2c1..b4d70b13be92 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -253,9 +253,6 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
struct inode *inode = dentry->d_inode;
int res;
- if (S_ISDIR(inode->i_mode))
- dentry_unhash(dentry);
-
if (S_ISDIR(inode->i_mode) && inode->i_size != 2)
return -ENOTEMPTY;
res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
@@ -286,9 +283,6 @@ static int hfs_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);
-
res = hfs_remove(new_dir, new_dentry);
if (res)
return res;