summaryrefslogtreecommitdiffstats
path: root/fs/fuse/file.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-10-01 16:44:53 +0200
committerMiklos Szeredi <mszeredi@suse.cz>2013-10-01 16:44:53 +0200
commit1e112a484e58cd13e6c90a3dfd9e54ea5859b795 (patch)
treeb7700baf2cbfbdc09e8866b921d44c1f13b0d1c1 /fs/fuse/file.c
parentfuse: fix race in fuse_writepages() (diff)
downloadlinux-1e112a484e58cd13e6c90a3dfd9e54ea5859b795.tar.xz
linux-1e112a484e58cd13e6c90a3dfd9e54ea5859b795.zip
fuse: writepages: fix aggregation
Checking against tmp-page indexes is not very useful, and results in one (or rarely two) page requests. Which is not much of an improvement... Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse/file.c')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index cc3a6c4437e4..bf765cf7b112 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1633,7 +1633,7 @@ static int fuse_writepages_fill(struct page *page,
BUG_ON(!req->num_pages);
if (req->num_pages == FUSE_MAX_PAGES_PER_REQ ||
(req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_write ||
- req->pages[req->num_pages - 1]->index + 1 != page->index) {
+ data->orig_pages[req->num_pages - 1]->index + 1 != page->index) {
fuse_writepages_send(data);
data->req = NULL;