aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-09-04 18:45:54 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-09-19 15:04:38 +0100
commit68b7b07e0d827a581058c5e4adb0a348e9a53a53 (patch)
treecc3890b9871916cbf9fa5c03df58727c8d9df94c /fs/fuse
parent7b07c2bc5547b5f4b35eda35b6754faf10b5ccc7 (diff)
downloadkernel_samsung_smdk4412-68b7b07e0d827a581058c5e4adb0a348e9a53a53.zip
kernel_samsung_smdk4412-68b7b07e0d827a581058c5e4adb0a348e9a53a53.tar.gz
kernel_samsung_smdk4412-68b7b07e0d827a581058c5e4adb0a348e9a53a53.tar.bz2
fuse: fix retrieve length
commit c9e67d483776d8d2a5f3f70491161b205930ffe1 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/fuse')
-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 2aaf3ea..5c029fb 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1524,6 +1524,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++;