summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-24 13:06:21 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-26 07:26:58 -0400
commit7ca57363880c2b321ff64d34a82ae4af86ee52d5 (patch)
treed3357986981a8e1d1be15f4b02b0c81cee947bea /fs
parent8cbfa53b1cd08ae3b315bbb55f7396f5a6a6a4f7 (diff)
downloadlinux-3.10-7ca57363880c2b321ff64d34a82ae4af86ee52d5.tar.gz
linux-3.10-7ca57363880c2b321ff64d34a82ae4af86ee52d5.tar.bz2
linux-3.10-7ca57363880c2b321ff64d34a82ae4af86ee52d5.zip
ocfs2: remove unnecessary dentry_unhash on rmdir/rename_dir
Ocfs2 has no issues with lingering references to unlinked directory inodes. CC: Mark Fasheh <mfasheh@suse.com> CC: ocfs2-devel@oss.oracle.com Acked-by: Joel Becker <jlbec@evilplan.org> 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/ocfs2/namei.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index f3582a6a6da..e5d738cd9cc 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -810,9 +810,6 @@ static int ocfs2_unlink(struct inode *dir,
(unsigned long long)OCFS2_I(dir)->ip_blkno,
(unsigned long long)OCFS2_I(inode)->ip_blkno);
- if (S_ISDIR(inode->i_mode))
- dentry_unhash(dentry);
-
dquot_initialize(dir);
BUG_ON(dentry->d_parent->d_inode != dir);
@@ -1066,9 +1063,6 @@ static int ocfs2_rename(struct inode *old_dir,
struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
struct ocfs2_dir_lookup_result target_insert = { NULL, };
- if (new_inode && S_ISDIR(new_inode->i_mode))
- dentry_unhash(new_dentry);
-
/* At some point it might be nice to break this function up a
* bit. */