From 17b23ac3a5149eeb4d38d4830d9c5c80059ffdc3 Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Mon, 10 Oct 2016 20:21:45 -0700
Subject: Move session options into sub-struct

The session options are used only once to determine the proper
conn->want flags. It is nice to have them clearly separated from the
other struct fuse_session members that are used throughout the life of
the file system.
---
 lib/fuse_i.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'lib/fuse_i.h')

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index c8aa279..9f11da7 100644
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -41,14 +41,7 @@ struct fuse_notify_req {
 	struct fuse_notify_req *prev;
 };
 
-struct fuse_session {
-	char *mountpoint;
-	volatile int exited;
-	int fd;
-	struct mount_opts *mo;
-
-	int debug;
-	int allow_root;
+struct session_opts {
 	int atomic_o_trunc;
 	int no_remote_posix_lock;
 	int no_remote_flock;
@@ -66,9 +59,18 @@ struct fuse_session {
 	int no_async_dio;
 	int writeback_cache;
 	int no_writeback_cache;
-	int clone_fd;
 	int async_read;
 	int sync_read;
+};
+
+struct fuse_session {
+	char *mountpoint;
+	volatile int exited;
+	int fd;
+	struct mount_opts *mo;
+	struct session_opts opts;
+	int debug;
+	int allow_root;
 	struct fuse_lowlevel_ops op;
 	int got_init;
 	struct cuse_data *cuse_data;
@@ -84,6 +86,7 @@ struct fuse_session {
 	uint64_t notify_ctr;
 	struct fuse_notify_req notify_list;
 	size_t bufsize;
+	int clone_fd;
 };
 
 struct fuse_chan {
-- 
cgit v1.2.3