---

yaml --- r: 252728 b: refs/heads/master c: 45adfef h: refs/heads/master v: v3
git-mirror · May 28, 2011 · a5fc48d · a5fc48d
1 parent 5520874
commit a5fc48d
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: b80d2c228d8206cadc32226750dbbf3b707bdd19
+refs/heads/master: 45adfef7d023004ff95bf63b5f2f0e2d88afac3f
diff --git a/trunk/fs/hpfs/namei.c b/trunk/fs/hpfs/namei.c
@@ -439,8 +439,6 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry)
 	int err;
 	int r;
 
-	dentry_unhash(dentry);
-
 	hpfs_adjust_length(name, &len);
 	hpfs_lock(dir->i_sb);
 	err = -ENOENT;
@@ -535,9 +533,6 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct fnode *fnode;
 	int err;
 
-	if (new_inode && S_ISDIR(new_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	if ((err = hpfs_chk_name(new_name, &new_len))) return err;
 	err = 0;
 	hpfs_adjust_length(old_name, &old_len);