---

yaml --- r: 322591 b: refs/heads/master c: 8d39d80 h: refs/heads/master i: 322589: 0ab9c13 322587: 940da04 322583: d2630e0 322575: 4183316 322559: 0be7cf4 v: v3
git-mirror · Aug 30, 2012 · 21c4313 · 21c4313
1 parent e59d711
commit 21c4313
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbd99797973f2cebd905bf6469ce08b531ab258f
+refs/heads/master: 8d39d801d64658d7d69e4754f287a71e9f9bbcb8
diff --git a/trunk/fs/fuse/cuse.c b/trunk/fs/fuse/cuse.c
@@ -396,7 +396,7 @@ static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
 err_region:
 	unregister_chrdev_region(devt, 1);
 err:
-	fc->conn_error = 1;
+	fuse_conn_kill(fc);
 	goto out;
 }
 
@@ -532,8 +532,6 @@ static int cuse_channel_release(struct inode *inode, struct file *file)
 		cdev_del(cc->cdev);
 	}
 
-	/* kill connection and shutdown channel */
-	fuse_conn_kill(&cc->fc);
 	rc = fuse_dev_release(inode, file);	/* puts the base reference */
 
 	return rc;