diff options
| -rw-r--r-- | lib/fuse.c | 9 | ||||
| -rw-r--r-- | lib/fuse_i.h | 10 | ||||
| -rw-r--r-- | lib/fuse_loop.c | 2 | ||||
| -rw-r--r-- | lib/fuse_loop_mt.c | 5 | ||||
| -rw-r--r-- | lib/fuse_lowlevel.c | 10 |
5 files changed, 20 insertions, 16 deletions
@@ -4550,13 +4550,14 @@ static int fuse_session_loop_remember(struct fuse *f) else break; } else if (res > 0) { - res = fuse_session_receive_buf_int(se, &fbuf, NULL); + res = fuse_session_receive_buf_internal(se, &fbuf, + NULL); if (res == -EINTR) continue; if (res <= 0) break; - fuse_session_process_buf_int(se, &fbuf, NULL); + fuse_session_process_buf_internal(se, &fbuf, NULL); } else { timeout = fuse_clean_cache(f); curr_time(&now); @@ -4774,7 +4775,7 @@ void fuse_lib_help(struct fuse_args *args) fuse_lib_opt_proc) == -1 || !conf.modules) return; - + char *module; char *next; struct fuse_module *m; @@ -4792,8 +4793,6 @@ void fuse_lib_help(struct fuse_args *args) } } - - static int fuse_init_intr_signal(int signum, int *installed) { struct sigaction old_sa; diff --git a/lib/fuse_i.h b/lib/fuse_i.h index 6713ab8..ea04c34 100644 --- a/lib/fuse_i.h +++ b/lib/fuse_i.h @@ -190,10 +190,12 @@ int fuse_start_thread(pthread_t *thread_id, void *(*func)(void *), void *arg); void fuse_buf_free(struct fuse_buf *buf); -int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf, - struct fuse_chan *ch); -void fuse_session_process_buf_int(struct fuse_session *se, - const struct fuse_buf *buf, struct fuse_chan *ch); +int fuse_session_receive_buf_internal(struct fuse_session *se, + struct fuse_buf *buf, + struct fuse_chan *ch); +void fuse_session_process_buf_internal(struct fuse_session *se, + const struct fuse_buf *buf, + struct fuse_chan *ch); struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, void *private_data); diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c index 742d169..410f43f 100644 --- a/lib/fuse_loop.c +++ b/lib/fuse_loop.c @@ -24,7 +24,7 @@ int fuse_session_loop(struct fuse_session *se) }; while (!fuse_session_exited(se)) { - res = fuse_session_receive_buf_int(se, &fbuf, NULL); + res = fuse_session_receive_buf_internal(se, &fbuf, NULL); if (res == -EINTR) continue; diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c index c66a503..0e79b49 100644 --- a/lib/fuse_loop_mt.c +++ b/lib/fuse_loop_mt.c @@ -135,7 +135,8 @@ static void *fuse_do_work(void *data) int res; pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - res = fuse_session_receive_buf_int(mt->se, &w->fbuf, w->ch); + res = fuse_session_receive_buf_internal(mt->se, &w->fbuf, + w->ch); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); if (res == -EINTR) continue; @@ -171,7 +172,7 @@ static void *fuse_do_work(void *data) fuse_loop_start_thread(mt); pthread_mutex_unlock(&mt->lock); - fuse_session_process_buf_int(mt->se, &w->fbuf, w->ch); + fuse_session_process_buf_internal(mt->se, &w->fbuf, w->ch); pthread_mutex_lock(&mt->lock); if (!isforget) diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 4b45f73..e48efa5 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -2740,10 +2740,11 @@ static int fuse_ll_copy_from_pipe(struct fuse_bufvec *dst, void fuse_session_process_buf(struct fuse_session *se, const struct fuse_buf *buf) { - fuse_session_process_buf_int(se, buf, NULL); + fuse_session_process_buf_internal(se, buf, NULL); } -void fuse_session_process_buf_int(struct fuse_session *se, +/* libfuse internal handler */ +void fuse_session_process_buf_internal(struct fuse_session *se, const struct fuse_buf *buf, struct fuse_chan *ch) { const size_t write_header_size = sizeof(struct fuse_in_header) + @@ -3189,8 +3190,9 @@ int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf) } /* libfuse internal handler */ -int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf, - struct fuse_chan *ch) +int fuse_session_receive_buf_internal(struct fuse_session *se, + struct fuse_buf *buf, + struct fuse_chan *ch) { return _fuse_session_receive_buf(se, buf, ch, true); } |