From: Nikolaus Rath <Nikolaus@rath.org>
Date: Wed, 5 Oct 2016 03:43:08 +0000 (-0700)
Subject: Merge fuse_ll into fuse_session (part 4)
X-Git-Tag: fuse-3.0.0rc1~89^2~4
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a5374df98e6683d4d536637d0fa4236c8b7c6bf1;p=qemu-gpiodev%2Flibfuse.git

Merge fuse_ll into fuse_session (part 4)

Merge fuse_ll_destroy() and fuse_session_destroy().
---

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)
 {