---

yaml --- r: 252710 b: refs/heads/master c: dfb55de h: refs/heads/master v: v3
git-mirror · May 28, 2011 · 3546d55 · 3546d55
1 parent d01247a
commit 3546d55
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64370e2f9df572977757d70b1ad293b743dd9e20
+refs/heads/master: dfb55de89879a1c32a70d0a510b3701ed9a6b855
diff --git a/trunk/fs/nilfs2/namei.c b/trunk/fs/nilfs2/namei.c
@@ -334,8 +334,6 @@ static int nilfs_rmdir(struct inode *dir, struct dentry *dentry)
 	struct nilfs_transaction_info ti;
 	int err;
 
-	dentry_unhash(dentry);
-
 	err = nilfs_transaction_begin(dir->i_sb, &ti, 0);
 	if (err)
 		return err;
@@ -371,9 +369,6 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct nilfs_transaction_info ti;
 	int err;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	err = nilfs_transaction_begin(old_dir->i_sb, &ti, 1);
 	if (unlikely(err))
 		return err;