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;