Make -o clone_fd into a parameter of session_loop_mt().

This option really affects the behavior of the session loop, not the
low-level interface. Therefore, it does not belong in the fuse_session
object.

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 5ddefdbc0de207ea952c9f0ca0bb24bdba85df92..8a99d85aa268aec7ac0b2f9f3d0247122a27e236 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,10 @@
 Unreleased Changes
 ==================
 
+* The `fuse_session_new` function no longer accepts the ``-o
+  clone_fd`` option. Instead, this has become a parameter of the
+  `fuse_session_loop_mt` and ``fuse_loop_mt` functions.
+
 * For low-level file systems that implement the `write_buf` handler,
   the `splice_read` option is now enabled by default. As usual, this
   can be changed in the file system's `init` handler.

diff --git a/example/hello_ll.c b/example/hello_ll.c
index b830cb220813b7448529c89df5e9b08c5510f796..e0ce61056800da6a30251178f8bb94d2fd561bea 100644 (file)
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
        if (opts.singlethread)
                ret = fuse_session_loop(se);
        else
-               ret = fuse_session_loop_mt(se);
+               ret = fuse_session_loop_mt(se, opts.clone_fd);
 
        fuse_session_unmount(se);
 err_out3:

diff --git a/example/notify_inval_entry.c b/example/notify_inval_entry.c
index 898eff18330f2b66361b426529ff2c02180b2917..1c2a6c959cbd2c5e1f81352342392be27587c990 100644 (file)
--- a/example/notify_inval_entry.c
+++ b/example/notify_inval_entry.c
@@ -327,7 +327,7 @@ int main(int argc, char *argv[]) {
     if (opts.singlethread)
         ret = fuse_session_loop(se);
     else
-        ret = fuse_session_loop_mt(se);
+        ret = fuse_session_loop_mt(se, opts.clone_fd);
 
     fuse_session_unmount(se);
 err_out3:

diff --git a/example/notify_inval_inode.c b/example/notify_inval_inode.c
index 1b813a0324810d25412c0a73f1376cd252d3d437..c9ab4d8b82373caaf1d8300d55fa2b92f7dc1116 100644 (file)
--- a/example/notify_inval_inode.c
+++ b/example/notify_inval_inode.c
@@ -350,7 +350,7 @@ int main(int argc, char *argv[]) {
     if (opts.singlethread)
         ret = fuse_session_loop(se);
     else
-        ret = fuse_session_loop_mt(se);
+        ret = fuse_session_loop_mt(se, opts.clone_fd);
 
     fuse_session_unmount(se);
 err_out3:

diff --git a/example/notify_store_retrieve.c b/example/notify_store_retrieve.c
index 76f3291503ab61f2ab43b203e6397d44043736ac..5b5fa63aa0a49559bc83974c388cb68c6c3ea94f 100644 (file)
--- a/example/notify_store_retrieve.c
+++ b/example/notify_store_retrieve.c
@@ -393,7 +393,7 @@ int main(int argc, char *argv[]) {
     if (opts.singlethread)
         ret = fuse_session_loop(se);
     else
-        ret = fuse_session_loop_mt(se);
+        ret = fuse_session_loop_mt(se, opts.clone_fd);
 
     assert(retrieve_status != 1);
     fuse_session_unmount(se);

diff --git a/example/passthrough_ll.c b/example/passthrough_ll.c
index 66f92cff260a4d6d99710892a4e5463c500b59ea..df9d7d33458e88501b463d9c7d09831edc6bbb39 100644 (file)
--- a/example/passthrough_ll.c
+++ b/example/passthrough_ll.c
@@ -504,7 +504,7 @@ int main(int argc, char *argv[])
        if (opts.singlethread)
                ret = fuse_session_loop(se);
        else
-               ret = fuse_session_loop_mt(se);
+               ret = fuse_session_loop_mt(se, opts.clone_fd);
 
        fuse_session_unmount(se);
 err_out3:

diff --git a/include/fuse.h b/include/fuse.h
index 894383570966b075123cc71fa29da50ca6c7ded2..5b9082bd88a2182811da87506d32e3c368aca278 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -748,11 +748,13 @@ void fuse_exit(struct fuse *f);
  * in the callback function of fuse_operations is also thread-safe.
  *
  * @param f the FUSE handle
+ * @param clone_fd whether to use separate device fds for each thread
+ *                 (may increase performance)
  * @return 0 if no error occurred, -1 otherwise
  *
  * See also: fuse_loop()
  */
-int fuse_loop_mt(struct fuse *f);
+int fuse_loop_mt(struct fuse *f, int clone_fd);
 
 /**
  * Get the current context

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 0f8c030d836b9831e50f7a06a4434620dcb08ecd..0b7ee2b4d5f1e24ab70ce7617ed0db8e69809b13 100644 (file)
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1657,6 +1657,7 @@ struct fuse_cmdline_opts {
        char *mountpoint;
        int show_version;
        int show_help;
+       int clone_fd;
 };
 
 /**
@@ -1727,9 +1728,11 @@ int fuse_session_loop(struct fuse_session *se);
  * Enter a multi-threaded event loop
  *
  * @param se the session
+ * @param clone_fd whether to use separate device fds for each thread
+ *                 (may increase performance)
  * @return 0 on success, -1 on error
  */
-int fuse_session_loop_mt(struct fuse_session *se);
+int fuse_session_loop_mt(struct fuse_session *se, int clone_fd);
 
 /**
  * Flag a session as terminated.

diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c
index c9aa47dfb048b4aed80e896e28beaa5e97847265..49fc7d4007c8789949760da28d57bae5fc78a4a3 100644 (file)
--- a/lib/cuse_lowlevel.c
+++ b/lib/cuse_lowlevel.c
@@ -350,7 +350,7 @@ int cuse_lowlevel_main(int argc, char *argv[], const struct cuse_info *ci,
                return 1;
 
        if (multithreaded)
-               res = fuse_session_loop_mt(se);
+               res = fuse_session_loop_mt(se, 0);
        else
                res = fuse_session_loop(se);
 

diff --git a/lib/fuse.c b/lib/fuse.c
index 3304d6817ae4cd0caafc7422a8ef73100ef9bd81..fb15b04839b7266996866276fa0c96737356f5b7 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4378,7 +4378,7 @@ int fuse_loop(struct fuse *f)
        return fuse_session_loop(f->se);
 }
 
-int fuse_loop_mt(struct fuse *f)
+int fuse_loop_mt(struct fuse *f, int clone_fd)
 {
        if (f == NULL)
                return -1;
@@ -4387,7 +4387,7 @@ int fuse_loop_mt(struct fuse *f)
        if (res)
                return -1;
 
-       res = fuse_session_loop_mt(fuse_get_session(f));
+       res = fuse_session_loop_mt(fuse_get_session(f), clone_fd);
        fuse_stop_cleanup_thread(f);
        return res;
 }

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index 9f11da7f05e53fab111973b27d4d4f3f04095566..5ed23c7cc0d8440755209c05afdad50c4fa3d5fc 100644 (file)
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -86,7 +86,6 @@ struct fuse_session {
        uint64_t notify_ctr;
        struct fuse_notify_req notify_list;
        size_t bufsize;
-       int clone_fd;
 };
 
 struct fuse_chan {

diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index e6e2263dc061d8840161a0cce0a37bcd8e5b5d5a..54fb56d5f24eaf5cea1c7864c5afe9ae98fc3cfa 100644 (file)
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -47,6 +47,7 @@ struct fuse_mt {
        sem_t finish;
        int exit;
        int error;
+       int clone_fd;
 };
 
 static struct fuse_chan *fuse_chan_new(int fd)
@@ -265,13 +266,13 @@ static int fuse_loop_start_thread(struct fuse_mt *mt)
        w->mt = mt;
 
        w->ch = NULL;
-       if (mt->se->clone_fd) {
+       if (mt->clone_fd) {
                w->ch = fuse_clone_chan(mt);
                if(!w->ch) {
                        /* Don't attempt this again */
                        fprintf(stderr, "fuse: trying to continue "
                                "without -o clone_fd.\n");
-                       mt->se->clone_fd = 0;
+                       mt->clone_fd = 0;
                }
        }
 
@@ -299,7 +300,7 @@ static void fuse_join_worker(struct fuse_mt *mt, struct fuse_worker *w)
        free(w);
 }
 
-int fuse_session_loop_mt(struct fuse_session *se)
+int fuse_session_loop_mt(struct fuse_session *se, int clone_fd)
 {
        int err;
        struct fuse_mt mt;
@@ -307,6 +308,7 @@ int fuse_session_loop_mt(struct fuse_session *se)
 
        memset(&mt, 0, sizeof(struct fuse_mt));
        mt.se = se;
+       mt.clone_fd = clone_fd;
        mt.error = 0;
        mt.numworker = 0;
        mt.numavail = 0;

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 00858630a6db0311984b759ac9be3c0c197fbc4a..33e0ae5b86f4987374451390c271d331c98e92d1 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2596,7 +2596,6 @@ static const struct fuse_opt fuse_ll_opts[] = {
        LL_OPTION("writeback_cache", opts.writeback_cache, 1),
        LL_OPTION("no_writeback_cache", opts.no_writeback_cache, 1),
        LL_OPTION("time_gran=%u", conn.time_gran, 0),
-       LL_OPTION("clone_fd", clone_fd, 1),
        FUSE_OPT_END
 };
 
@@ -2627,8 +2626,7 @@ void fuse_lowlevel_help(void)
 "    -o readdirplus=S         control readdirplus use (yes|no|auto)\n"
 "    -o [no_]async_dio        asynchronous direct I/O\n"
 "    -o [no_]writeback_cache  asynchronous, buffered writes\n"
-"    -o time_gran=N           time granularity in nsec\n"
-"    -o clone_fd              clone fuse device file descriptors\n\n");
+"    -o time_gran=N           time granularity in nsec\n\n");
 }
 
 void fuse_session_destroy(struct fuse_session *se)

diff --git a/lib/helper.c b/lib/helper.c
index cc5cefcdf2a29d4360e12f715e427d60259c6089..ea06d81fb8a075e5f713d001de116a0b90520550 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -45,6 +45,7 @@ static const struct fuse_opt fuse_helper_opts[] = {
        FUSE_HELPER_OPT("subtype=",     nodefault_subtype),
        FUSE_OPT_KEY("fsname=",         FUSE_OPT_KEY_KEEP),
        FUSE_OPT_KEY("subtype=",        FUSE_OPT_KEY_KEEP),
+       FUSE_HELPER_OPT("clone_fd",     clone_fd),
        FUSE_OPT_END
 };
 
@@ -56,6 +57,7 @@ void fuse_cmdline_help(void)
               "    -d   -o debug          enable debug output (implies -f)\n"
               "    -f                     foreground operation\n"
               "    -s                     disable multi-threaded operation\n"
+              "    -o clone_fd            use separate fuse device fd for each thread\n"
               "\n");
 }
 
@@ -246,7 +248,7 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op,
        if (opts.singlethread)
                res = fuse_loop(fuse);
        else
-               res = fuse_loop_mt(fuse);
+               res = fuse_loop_mt(fuse, opts.clone_fd);
        if (res)
                res = 1;