aboutsummaryrefslogtreecommitdiffstats
path: root/lib/fuse.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-06-21 18:17:27 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2013-06-21 18:17:27 +0200
commit5334a152e1272a072339fb4519de04ed4269d3ca (patch)
treece350efe74f0ecc17fd7cc4d43ddf51d06b5a993 /lib/fuse.c
parent39065e40e0f00528980b35b52d8f5e13759e5a59 (diff)
downloadlibfuse-5334a152e1272a072339fb4519de04ed4269d3ca.tar.gz
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.
Diffstat (limited to 'lib/fuse.c')
-rw-r--r--lib/fuse.c5
1 files changed, 2 insertions, 3 deletions
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);