diff options
| -rw-r--r-- | fs/ocfs2/namei.c | 6 | 
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, | |||
| 810 | (unsigned long long)OCFS2_I(dir)->ip_blkno, | 810 | (unsigned long long)OCFS2_I(dir)->ip_blkno, | 
| 811 | (unsigned long long)OCFS2_I(inode)->ip_blkno); | 811 | (unsigned long long)OCFS2_I(inode)->ip_blkno); | 
| 812 | 812 | ||
| 813 | if (S_ISDIR(inode->i_mode)) | ||
| 814 | dentry_unhash(dentry); | ||
| 815 | |||
| 816 | dquot_initialize(dir); | 813 | dquot_initialize(dir); | 
| 817 | 814 | ||
| 818 | BUG_ON(dentry->d_parent->d_inode != dir); | 815 | BUG_ON(dentry->d_parent->d_inode != dir); | 
| @@ -1066,9 +1063,6 @@ static int ocfs2_rename(struct inode *old_dir, | |||
| 1066 | struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; | 1063 | struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; | 
| 1067 | struct ocfs2_dir_lookup_result target_insert = { NULL, }; | 1064 | struct ocfs2_dir_lookup_result target_insert = { NULL, }; | 
| 1068 | 1065 | ||
| 1069 | if (new_inode && S_ISDIR(new_inode->i_mode)) | ||
| 1070 | dentry_unhash(new_dentry); | ||
| 1071 | |||
| 1072 | /* At some point it might be nice to break this function up a | 1066 | /* At some point it might be nice to break this function up a | 
| 1073 | * bit. */ | 1067 | * bit. */ | 
| 1074 | 1068 | ||
