From a5374df98e6683d4d536637d0fa4236c8b7c6bf1 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Tue, 4 Oct 2016 20:43:08 -0700 Subject: [PATCH] Merge fuse_ll into fuse_session (part 4) Merge fuse_ll_destroy() and fuse_session_destroy(). --- lib/fuse_lowlevel.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index a5dbe17..09ee8da 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_ll_destroy(struct fuse_session *f) +static void fuse_session_destroy(struct fuse_session *f) { struct fuse_ll_pipe *llp; @@ -2671,17 +2671,11 @@ static void fuse_ll_destroy(struct fuse_session *f) pthread_key_delete(f->pipe_key); pthread_mutex_destroy(&f->lock); free(f->cuse_data); + close(f->fd); + destroy_mount_opts(f->mo); free(f); } -void fuse_session_destroy(struct fuse_session *se) -{ - fuse_ll_destroy(se); - close(se->fd); - destroy_mount_opts(se->mo); - free(se); -} - static void fuse_ll_pipe_destructor(void *data) { -- 2.30.2