summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-09-04 18:45:54 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2012-09-04 18:45:54 +0200
commitc9e67d483776d8d2a5f3f70491161b205930ffe1 (patch)
treec2c76f9ac0891670c37079c6467505c56815fcd1 /fs
parent381bf7cad9dbce701c618f8942fd35954952ef39 (diff)
downloadlinux-3.10-c9e67d483776d8d2a5f3f70491161b205930ffe1.tar.gz
linux-3.10-c9e67d483776d8d2a5f3f70491161b205930ffe1.tar.bz2
linux-3.10-c9e67d483776d8d2a5f3f70491161b205930ffe1.zip
fuse: fix retrieve length
In some cases fuse_retrieve() would return a short byte count if offset was non-zero. The data returned was correct, though. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: stable@vger.kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 7df2b5e8fbe..f4246cfc8d8 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1576,6 +1576,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
req->pages[req->num_pages] = page;
req->num_pages++;
+ offset = 0;
num -= this_num;
total_len += this_num;
index++;