From 21c43130df26d0484b3485d0de1f79603109045a Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 30 Aug 2012 19:24:35 +0200 Subject: [PATCH] --- yaml --- r: 322591 b: refs/heads/master c: 8d39d801d64658d7d69e4754f287a71e9f9bbcb8 h: refs/heads/master i: 322589: 0ab9c1395c8cf853894c74ab2a04b691ec1aee10 322587: 940da04eec2cf57dbd90401d6ca4106d1877f3e7 322583: d2630e0d39c7fb13e8e3e86adfd94cdd0bf82344 322575: 41833163810f32b5a9ee1bba66791581cf27f081 322559: 0be7cf4c51f65a11b4128703ab3c0dc429e984e3 v: v3 --- [refs] | 2 +- trunk/fs/fuse/cuse.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 67c43f42d616..171c21000813 100644 --- 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 index 3426521f3205..ee8d55042298 100644 --- 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;