---

yaml --- r: 252727 b: refs/heads/master c: b80d2c2 h: refs/heads/master i: 252725: 85d54d8 252723: cf3f9a0 252719: 1f1ec06 v: v3
git-mirror · May 28, 2011 · 5520874 · 5520874
1 parent bdfc5da
commit 5520874
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: 526e7ce5528c8addcf154acec41b615f71dce7e1
+refs/heads/master: b80d2c228d8206cadc32226750dbbf3b707bdd19
diff --git a/trunk/fs/minix/namei.c b/trunk/fs/minix/namei.c
@@ -168,8 +168,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
 	struct inode * inode = dentry->d_inode;
 	int err = -ENOTEMPTY;
 
-	dentry_unhash(dentry);
-
 	if (minix_empty_dir(inode)) {
 		err = minix_unlink(dir, dentry);
 		if (!err) {
@@ -192,9 +190,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
 	struct minix_dir_entry * old_de;
 	int err = -ENOENT;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	old_de = minix_find_entry(old_dentry, &old_page);
 	if (!old_de)
 		goto out;