libfuse: replace fuse_session_next_chan

Replace fuse_session_next_chan() with fuse_session_chan(), as multiple
channels per session were never actually supported and probably never will.

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 9a162376be7a1dcfa4835486d0afbc9feb32c9fc..f62afccf29c496fb58808191bc69c418262820a2 100644 (file)
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1627,9 +1627,6 @@ struct fuse_session *fuse_session_new(struct fuse_session_ops *op, void *data);
 /**
  * Assign a channel to a session
  *
- * Note: currently only a single channel may be assigned.  This may
- * change in the future
- *
  * If a session is destroyed, the assigned channel is also destroyed
  *
  * @param se the session
@@ -1638,7 +1635,7 @@ struct fuse_session *fuse_session_new(struct fuse_session_ops *op, void *data);
 void fuse_session_add_chan(struct fuse_session *se, struct fuse_chan *ch);
 
 /**
- * Remove a channel from a session
+ * Remove the channel from a session
  *
  * If the channel is not assigned to a session, then this is a no-op
  *
@@ -1647,18 +1644,12 @@ void fuse_session_add_chan(struct fuse_session *se, struct fuse_chan *ch);
 void fuse_session_remove_chan(struct fuse_chan *ch);
 
 /**
- * Iterate over the channels assigned to a session
- *
- * The iterating function needs to start with a NULL channel, and
- * after that needs to pass the previously returned channel to the
- * function.
+ * Return channel assigned to the session
  *
  * @param se the session
- * @param ch the previous channel, or NULL
- * @return the next channel, or NULL if no more channels exist
+ * @return the channel
  */
-struct fuse_chan *fuse_session_next_chan(struct fuse_session *se,
-                                        struct fuse_chan *ch);
+struct fuse_chan *fuse_session_chan(struct fuse_session *se);
 
 /**
  * Process a raw request

diff --git a/lib/fuse.c b/lib/fuse.c
index e2d48d32789cc6a6d13fed339c183fe647067ef8..f15906318803b289e46409522b9ef21f8f633b75 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4021,7 +4021,7 @@ static int fuse_session_loop_remember(struct fuse *f)
        int res = 0;
        struct timespec now;
        time_t next_clean;
-       struct fuse_chan *ch = fuse_session_next_chan(se, NULL);
+       struct fuse_chan *ch = fuse_session_chan(se);
        size_t bufsize = fuse_chan_bufsize(ch);
        char *buf = (char *) malloc(bufsize);
        struct pollfd fds = {

diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c
index b7b4ca4eeed7cd2d5b844a255d17ab216286a75e..987a8d7a981fb562cf5cf99bb4db9776932a0e1c 100644 (file)
--- a/lib/fuse_loop.c
+++ b/lib/fuse_loop.c
@@ -15,7 +15,7 @@
 int fuse_session_loop(struct fuse_session *se)
 {
        int res = 0;
-       struct fuse_chan *ch = fuse_session_next_chan(se, NULL);
+       struct fuse_chan *ch = fuse_session_chan(se);
        size_t bufsize = fuse_chan_bufsize(ch);
        char *buf = (char *) malloc(bufsize);
        if (!buf) {

diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c
index 82e30014b7618fa5fe907cd696e576c4c6a003b3..f328fec244e50c4ceae3133886ce5e0f9a854fae 100644 (file)
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
@@ -224,7 +224,7 @@ int fuse_session_loop_mt(struct fuse_session *se)
 
        memset(&mt, 0, sizeof(struct fuse_mt));
        mt.se = se;
-       mt.prevch = fuse_session_next_chan(se, NULL);
+       mt.prevch = fuse_session_chan(se);
        mt.error = 0;
        mt.numworker = 0;
        mt.numavail = 0;

diff --git a/lib/fuse_session.c b/lib/fuse_session.c
index 80bf0ea844f598e411afc1ced42fe4f638d9e546..2a4fc8d03b391fff583768845c169cd3e1c87b1a 100644 (file)
--- a/lib/fuse_session.c
+++ b/lib/fuse_session.c
@@ -58,14 +58,9 @@ void fuse_session_remove_chan(struct fuse_chan *ch)
        }
 }
 
-struct fuse_chan *fuse_session_next_chan(struct fuse_session *se,
-                                        struct fuse_chan *ch)
+struct fuse_chan *fuse_session_chan(struct fuse_session *se)
 {
-       assert(ch == NULL || ch == se->ch);
-       if (ch == NULL)
-               return se->ch;
-       else
-               return NULL;
+       return se->ch;
 }
 
 void fuse_session_process(struct fuse_session *se, const char *buf, size_t len,

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 7c717f46600c0188b2a3c4cb833236445be7ae99..391c4f83a2eaade061f5819d6d9f5bb2b186eebe 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -25,7 +25,7 @@ FUSE_3.0 {
                fuse_session_loop;
                fuse_session_loop_mt;
                fuse_session_new;
-               fuse_session_next_chan;
+               fuse_session_chan;
                fuse_session_process;
                fuse_session_reset;
                fuse_opt_parse;

diff --git a/lib/helper.c b/lib/helper.c
index 58dfb4344c3bf941c52d121e305d37c2ceda48f1..139e1aee41124a4a953e8f105ab4ee5e3bb381fa 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -299,7 +299,7 @@ err_free:
 static void fuse_teardown(struct fuse *fuse, char *mountpoint)
 {
        struct fuse_session *se = fuse_get_session(fuse);
-       struct fuse_chan *ch = fuse_session_next_chan(se, NULL);
+       struct fuse_chan *ch = fuse_session_chan(se);
        fuse_remove_signal_handlers(se);
        fuse_unmount(mountpoint, ch);
        fuse_destroy(fuse);