---

yaml --- r: 252726 b: refs/heads/master c: 526e7ce h: refs/heads/master v: v3
git-mirror · May 28, 2011 · bdfc5da · bdfc5da
1 parent 85d54d8
commit bdfc5da
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: 42b850b2806f8f55f5c3a0e3c78af738d5054fdc
+refs/heads/master: 526e7ce5528c8addcf154acec41b615f71dce7e1
diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c
@@ -667,8 +667,6 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
 	if (IS_ERR(req))
 		return PTR_ERR(req);
 
-	dentry_unhash(entry);
-
 	req->in.h.opcode = FUSE_RMDIR;
 	req->in.h.nodeid = get_node_id(dir);
 	req->in.numargs = 1;
@@ -694,9 +692,6 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
 	struct fuse_conn *fc = get_fuse_conn(olddir);
 	struct fuse_req *req = fuse_get_req(fc);
 
-	if (newent->d_inode && S_ISDIR(newent->d_inode->i_mode))
-		dentry_unhash(newent);
-
 	if (IS_ERR(req))
 		return PTR_ERR(req);