aboutsummaryrefslogtreecommitdiff
path: root/lib/fuse_loop.c
diff options
context:
space:
mode:
authorGravatar Nikolaus Rath <Nikolaus@rath.org>2016-10-03 20:27:02 -0700
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2016-10-03 23:01:46 -0700
commite4015aca9b7ba0c787ad8d07f7d9db18d3bbc211 (patch)
tree579aa5f63874d979ec7b233214dbb0ee8debf260 /lib/fuse_loop.c
parente572cfbd3490add057b867c29d37da51ee8217e5 (diff)
Merge master fuse_chan into fuse_session.
This is a code simplification patch. - It confines most of the implementation channel implementation into fuse_loop_mt (which is its only user). - It makes it more obvious in the code that channels are only ever used when using -o clone_fd and multi-threaded main loop. - It simplies the definition of both struct fuse_session and struct fuse_chan. - Theoretically it should result in (minuscule) performance improvements when not using -o clone_fd. - Overall, it removes a lot more lines of source code than it adds :-).
Diffstat (limited to 'lib/fuse_loop.c')
-rw-r--r--lib/fuse_loop.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c
index 8414284..4a85b13 100644
--- a/lib/fuse_loop.c
+++ b/lib/fuse_loop.c
@@ -19,20 +19,19 @@
int fuse_session_loop(struct fuse_session *se)
{
int res = 0;
- struct fuse_chan *ch = fuse_session_chan(se);
struct fuse_buf fbuf = {
.mem = NULL,
};
while (!fuse_session_exited(se)) {
- res = fuse_session_receive_buf_int(se, &fbuf, ch);
+ res = fuse_session_receive_buf_int(se, &fbuf, NULL);
if (res == -EINTR)
continue;
if (res <= 0)
break;
- fuse_session_process_buf_int(se, &fbuf, ch);
+ fuse_session_process_buf_int(se, &fbuf, NULL);
}
free(fbuf.mem);