From 2ed7af90879eabbaed1cc063b3aded73588d9b08 Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Tue, 4 Oct 2016 20:32:38 -0700
Subject: Merge fuse_ll into fuse_session (part 1)

Merged the structures, and replaced fuse_ll with fuse_session
in all type definitions.
---
 lib/fuse_i.h | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'lib/fuse_i.h')

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index c968321..0b4c9f5 100644
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -9,25 +9,9 @@
 #include "fuse.h"
 #include "fuse_lowlevel.h"
 
-struct fuse_ll;
 struct mount_opts;
 
-struct fuse_session {
-	struct fuse_ll *f;
-	char *mountpoint;
-	volatile int exited;
-	int fd;
-	struct mount_opts *mo;
-};
-
-struct fuse_chan {
-	pthread_mutex_t lock;
-	int ctr;
-	int fd;
-};
-
 struct fuse_req {
-	struct fuse_ll *f;
 	struct fuse_session *se;
 	uint64_t unique;
 	int ctr;
@@ -57,7 +41,13 @@ struct fuse_notify_req {
 	struct fuse_notify_req *prev;
 };
 
-struct fuse_ll {
+struct fuse_session {
+	struct fuse_ll *f;
+	char *mountpoint;
+	volatile int exited;
+	int fd;
+	struct mount_opts *mo;
+
 	int debug;
 	int allow_root;
 	int atomic_o_trunc;
@@ -96,6 +86,12 @@ struct fuse_ll {
 	size_t bufsize;
 };
 
+struct fuse_chan {
+	pthread_mutex_t lock;
+	int ctr;
+	int fd;
+};
+
 /**
  * Filesystem module
  *
-- 
cgit v1.2.3