kclient: no fallback to writepage, be careful with wsize

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 0ae99fd9801ed7cac5244190016b3a330baee5a9..c14abc86e42e336e7a77c28640d924f975dab161 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -357,13 +357,11 @@ static int ceph_writepages(struct address_space *mapping,
 
        if (client->mount_args.wsize && client->mount_args.wsize < wsize)
                wsize = client->mount_args.wsize;
+       if (wsize < PAGE_CACHE_SIZE)
+               wsize = PAGE_CACHE_SIZE;
 
        dout(10, "writepages on %p, wsize %u\n", inode, wsize);
 
-       /* if wsize is small, write 1 page at a time */
-       if (wsize < PAGE_CACHE_SIZE)
-               return generic_writepages(mapping, wbc);
-
        /* larger page vector? */
        max_pages = wsize >> PAGE_CACHE_SHIFT;
        pages = kmalloc(max_pages * sizeof(*pages), GFP_NOFS);