---

yaml --- r: 251689 b: refs/heads/master c: 5c5d3f3 h: refs/heads/master i: 251687: 9ca4fc1 v: v3
git-mirror · May 26, 2011 · 54b17e2 · 54b17e2
1 parent b870d7e
commit 54b17e2
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: a71905f0db41d4b2b01044fb40f97656fefc44a7
+refs/heads/master: 5c5d3f3b871a719e2c6413b85009c723adeb27e1
diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c
@@ -311,8 +311,6 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry)
 	if (!simple_empty(dentry))
 		return -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	drop_nlink(dentry->d_inode);
 	simple_unlink(dir, dentry);
 	drop_nlink(dir);
@@ -325,9 +323,6 @@ int simple_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct inode *inode = old_dentry->d_inode;
 	int they_are_dirs = S_ISDIR(old_dentry->d_inode->i_mode);
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	if (!simple_empty(new_dentry))
 		return -ENOTEMPTY;