From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 1 Oct 2013 14:44:53 +0000 (+0200)
Subject: fuse: writepages: fix aggregation
X-Git-Tag: firefly_0821_release~176^2~4998^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e112a484e58cd13e6c90a3dfd9e54ea5859b795;p=firefly-linux-kernel-4.4.55.git

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

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;