From 5334a152e1272a072339fb4519de04ed4269d3ca Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 21 Jun 2013 18:17:27 +0200 Subject: libfuse: remove fuse_chan_(send|receive) Move the fuse_chan_ops.send and .receive implementations to fuse_lowlevel.c. The abstraction wasn't actually useful and made the the splice implementation more difficult. Remove fuse_chan_ops.send and fuse_chan_ops.receive. --- lib/fuse.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/fuse.c') diff --git a/lib/fuse.c b/lib/fuse.c index f159063..8047933 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -4037,7 +4037,6 @@ static int fuse_session_loop_remember(struct fuse *f) curr_time(&now); next_clean = now.tv_sec; while (!fuse_session_exited(se)) { - struct fuse_chan *tmpch = ch; struct fuse_buf fbuf = { .mem = buf, .size = bufsize, @@ -4057,14 +4056,14 @@ static int fuse_session_loop_remember(struct fuse *f) else break; } else if (res > 0) { - res = fuse_session_receive_buf(se, &fbuf, &tmpch); + res = fuse_session_receive_buf(se, &fbuf, ch); if (res == -EINTR) continue; if (res <= 0) break; - fuse_session_process_buf(se, &fbuf, tmpch); + fuse_session_process_buf(se, &fbuf, ch); } else { timeout = fuse_clean_cache(f); curr_time(&now); -- cgit v1.2.3