From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 4 Sep 2012 16:45:54 +0000 (+0200)
Subject: fuse: fix retrieve length
X-Git-Tag: v3.2.30~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68b7b07e0d827a581058c5e4adb0a348e9a53a53;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 2aaf3eaaf13da..5c029fb3e087a 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++;