diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse.c | 4 | ||||
| -rw-r--r-- | lib/fuse_lowlevel.c | 4 | ||||
| -rw-r--r-- | lib/fuse_mt.c | 6 | ||||
| -rw-r--r-- | lib/fuse_session.c | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -1820,11 +1820,11 @@ struct fuse *fuse_new_common(int fd, const char *opts, free(llopts); if (f->se == NULL) goto out_free; - + ch = fuse_kern_chan_new(fd); if (ch == NULL) goto out_free_session; - + fuse_session_add_chan(f->se, ch); f->ctr = 0; diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 09c9681..eb7996c 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -715,7 +715,7 @@ static void fuse_ll_process(void *data, const char *buf, size_t len, case FUSE_INIT: do_init(req, (struct fuse_init_in_out *) inarg); break; - + case FUSE_LOOKUP: do_lookup(req, in->nodeid, (char *) inarg); break; @@ -875,7 +875,7 @@ static void fuse_ll_destroy(void *data) } -struct fuse_session *fuse_lowlevel_new(const char *opts, +struct fuse_session *fuse_lowlevel_new(const char *opts, const struct fuse_lowlevel_ops *op, size_t op_size, void *userdata) { diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c index accd6c4..1136ee9 100644 --- a/lib/fuse_mt.c +++ b/lib/fuse_mt.c @@ -109,13 +109,13 @@ static int mt_chan_receive(struct fuse_chan *ch, char *buf, size_t size) struct procdata *pd = (struct procdata *) fuse_chan_data(ch); assert(size >= sizeof(cmd)); - + cmd = fuse_read_cmd(pd->f); if (cmd == NULL) return 0; - + *(struct fuse_cmd **) buf = cmd; - + return sizeof(cmd); } diff --git a/lib/fuse_session.c b/lib/fuse_session.c index 5fd1fc7..f88d6e5 100644 --- a/lib/fuse_session.c +++ b/lib/fuse_session.c @@ -17,7 +17,7 @@ struct fuse_session { struct fuse_session_ops op; void *data; - + volatile int exited; struct fuse_chan *ch; @@ -31,7 +31,7 @@ struct fuse_chan { int fd; size_t bufsize; - + void *data; }; @@ -105,7 +105,7 @@ int fuse_session_exited(struct fuse_session *se) return se->exited; } -struct fuse_chan *fuse_chan_new(struct fuse_chan_ops *op, int fd, +struct fuse_chan *fuse_chan_new(struct fuse_chan_ops *op, int fd, size_t bufsize, void *data) { struct fuse_chan *ch = (struct fuse_chan *) malloc(sizeof(*ch)); |