From 3c2a296b0b10143ac378bde035f51a0185805a63 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Tue, 4 Oct 2016 20:44:09 -0700 Subject: [PATCH] Merge fuse_ll into fuse_session (part 5) Fixup fuse_session_new(). --- lib/fuse_lowlevel.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 09ee8da..910c49e 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -2657,7 +2657,7 @@ static int fuse_ll_opt_proc(void *data, const char *arg, int key, return 1; } -static void fuse_session_destroy(struct fuse_session *f) +void fuse_session_destroy(struct fuse_session *f) { struct fuse_ll_pipe *llp; @@ -2844,7 +2844,6 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, { int err; struct fuse_session *f; - struct fuse_session *se; struct mount_opts *mo; if (sizeof(struct fuse_lowlevel_ops) < op_size) { @@ -2900,18 +2899,9 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, f->owner = getuid(); f->userdata = userdata; - se = (struct fuse_session *) malloc(sizeof(*se)); - if (se == NULL) { - fprintf(stderr, "fuse: failed to allocate session\n"); - goto out6; - } - memset(se, 0, sizeof(*se)); - se = f; - se->mo = mo; - return se; + f->mo = mo; + return f; -out6: - pthread_key_delete(f->pipe_key); out5: pthread_mutex_destroy(&f->lock); out4: -- 2.30.2