[PATCH] fuse_writepages_fill: simplified "if-else if" constuction

[Vasily Averin]

fuse_writepages_fill uses following construction:
if (wpa && ap->num_pages &&
    (A || B || C)) {
        action;
} else if (wpa && D) {
        if (E) {
                the same action;
        }
}

- ap->num_pages check is always true and can be removed
- "if" and "else if" calls the same action and can be merged.

Signed-off-by: Vasily Averin <v...@virtuozzo.com>
---
 fs/fuse/file.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index cf267bd..c023f7f0 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2035,17 +2035,14 @@ static int fuse_writepages_fill(struct page *page,
         */
        is_writeback = fuse_page_is_writeback(inode, page->index);
 
-       if (wpa && ap->num_pages &&
+       if (wpa &&
            (is_writeback || ap->num_pages == fc->max_pages ||
             (ap->num_pages + 1) * PAGE_SIZE > fc->max_write ||
-            data->orig_pages[ap->num_pages - 1]->index + 1 != page->index)) {
+            (data->orig_pages[ap->num_pages - 1]->index + 1 != page->index) ||
+            ((ap->num_pages == data->max_pages) &&
+                               (!fuse_pages_realloc(data))))) {
                fuse_writepages_send(data);
                data->wpa = NULL;
-       } else if (wpa && ap->num_pages == data->max_pages) {
-               if (!fuse_pages_realloc(data)) {
-                       fuse_writepages_send(data);
-                       data->wpa = NULL;
-               }
        }
 
        err = -ENOMEM;
-- 
1.8.3.1