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 a5dbe17f2c4208a6e0dd2b9515ee2784dda32243..09ee8da82e8ed5688e60eb802d9d71b19eee8144 100644 (file)
--- 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)
 {