diff options
| author | Dan Murphy <dmurphy@ti.com> | 2012-02-02 14:16:57 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-02 14:19:13 -0600 |
| commit | 04cc23436ebc4f0caf088a97ef9404ea71acfdd1 (patch) | |
| tree | 9994f9a05d68e47e51368017288c157936e9e1cd /fs/fuse | |
| parent | 50725abe80c6893a7134977c8b576a0ec4eef5a5 (diff) | |
| parent | 235eae6e5e402f5f723203e4444f10c16c7c3be3 (diff) | |
| download | kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.zip kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.tar.gz kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.tar.bz2 | |
Merge branch 'linux-3.0.18' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/smartreflex.c
drivers/i2c/busses/i2c-omap.c
drivers/usb/host/ehci.h
drivers/usb/musb/musb_core.c
fs/proc/base.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index fb6fc95..c858b5c 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1516,7 +1516,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, else if (outarg->offset + num > file_size) num = file_size - outarg->offset; - while (num) { + while (num && req->num_pages < FUSE_MAX_PAGES_PER_REQ) { struct page *page; unsigned int this_num; @@ -1530,6 +1530,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, num -= this_num; total_len += this_num; + index++; } req->misc.retrieve_in.offset = outarg->offset; req->misc.retrieve_in.size = total_len; |