1 files changed, 34 insertions, 58 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 6ab4d5a9edf2..9a55807b2a70 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -27,7 +27,8 @@
 
 #define NFSDBG_FACILITY         NFSDBG_PAGECACHE
 
-static int nfs_pagein_one(struct list_head *, struct inode *);
+static int nfs_pagein_multi(struct inode *, struct list_head *, unsigned int, size_t, int);
+static int nfs_pagein_one(struct inode *, struct list_head *, unsigned int, size_t, int);
 static const struct rpc_call_ops nfs_read_partial_ops;
 static const struct rpc_call_ops nfs_read_full_ops;
 
@@ -36,9 +37,8 @@ static mempool_t *nfs_rdata_mempool;
 
 #define MIN_POOL_READ   (32)
 
-struct nfs_read_data *nfs_readdata_alloc(size_t len)
+struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount)
 {
-        unsigned int pagecount = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
         struct nfs_read_data *p = mempool_alloc(nfs_rdata_mempool, GFP_NOFS);
 
         if (p) {
@@ -133,7 +133,10 @@ static int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
                 memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
 
         nfs_list_add_request(new, &one_request);
-        nfs_pagein_one(&one_request, inode);
+        if (NFS_SERVER(inode)->rsize < PAGE_CACHE_SIZE)
+                nfs_pagein_multi(inode, &one_request, 1, len, 0);
+        else
+                nfs_pagein_one(inode, &one_request, 1, len, 0);
         return 0;
 }
 
@@ -230,7 +233,7 @@ static void nfs_execute_read(struct nfs_read_data *data)
  * won't see the new data until our attribute cache is updated.  This is more
  * or less conventional NFS client behavior.
  */
-static int nfs_pagein_multi(struct list_head *head, struct inode *inode)
+static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigned int npages, size_t count, int flags)
 {
         struct nfs_page *req = nfs_list_entry(head->next);
         struct page *page = req->wb_page;
@@ -242,11 +245,11 @@ static int nfs_pagein_multi(struct list_head *head, struct inode *inode)
 
         nfs_list_remove_request(req);
 
-        nbytes = req->wb_bytes;
+        nbytes = count;
         do {
                 size_t len = min(nbytes,rsize);
 
-                data = nfs_readdata_alloc(len);
+                data = nfs_readdata_alloc(1);
                 if (!data)
                         goto out_bad;
                 INIT_LIST_HEAD(&data->pages);
@@ -258,23 +261,19 @@ static int nfs_pagein_multi(struct list_head *head, struct inode *inode)
 
         ClearPageError(page);
         offset = 0;
-        nbytes = req->wb_bytes;
+        nbytes = count;
         do {
                 data = list_entry(list.next, struct nfs_read_data, pages);
                 list_del_init(&data->pages);
 
                 data->pagevec[0] = page;
 
-                if (nbytes > rsize) {
-                        nfs_read_rpcsetup(req, data, &nfs_read_partial_ops,
-                                        rsize, offset);
-                        offset += rsize;
-                        nbytes -= rsize;
-                } else {
-                        nfs_read_rpcsetup(req, data, &nfs_read_partial_ops,
-                                        nbytes, offset);
-                        nbytes = 0;
-                }
+                if (nbytes < rsize)
+                        rsize = nbytes;
+                nfs_read_rpcsetup(req, data, &nfs_read_partial_ops,
+                                  rsize, offset);
+                offset += rsize;
+                nbytes -= rsize;
                 nfs_execute_read(data);
         } while (nbytes != 0);
 
@@ -291,30 +290,24 @@ out_bad:
         return -ENOMEM;
 }
 
-static int nfs_pagein_one(struct list_head *head, struct inode *inode)
+static int nfs_pagein_one(struct inode *inode, struct list_head *head, unsigned int npages, size_t count, int flags)
 {
         struct nfs_page         *req;
         struct page             **pages;
         struct nfs_read_data    *data;
-        unsigned int            count;
 
-        if (NFS_SERVER(inode)->rsize < PAGE_CACHE_SIZE)
-                return nfs_pagein_multi(head, inode);
-
-        data = nfs_readdata_alloc(NFS_SERVER(inode)->rsize);
+        data = nfs_readdata_alloc(npages);
         if (!data)
                 goto out_bad;
 
         INIT_LIST_HEAD(&data->pages);
         pages = data->pagevec;
-        count = 0;
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
                 nfs_list_add_request(req, &data->pages);
                 ClearPageError(req->wb_page);
                 *pages++ = req->wb_page;
-                count += req->wb_bytes;
         }
         req = nfs_list_entry(data->pages.next);
 
@@ -327,28 +320,6 @@ out_bad:
         return -ENOMEM;
 }
 
-static int
-nfs_pagein_list(struct list_head *head, int rpages)
-{
-        LIST_HEAD(one_request);
-        struct nfs_page         *req;
-        int                     error = 0;
-        unsigned int            pages = 0;
-
-        while (!list_empty(head)) {
-                pages += nfs_coalesce_requests(head, &one_request, rpages);
-                req = nfs_list_entry(one_request.next);
-                error = nfs_pagein_one(&one_request, req->wb_context->dentry->d_inode);
-                if (error < 0)
-                        break;
-        }
-        if (error >= 0)
-                return pages;
-
-        nfs_async_read_error(head);
-        return error;
-}
-
 /*
  * This is the callback from RPC telling us whether a reply was
  * received or some error occurred (timeout or socket shutdown).
@@ -538,7 +509,7 @@ out_error:
 }
 
 struct nfs_readdesc {
-        struct list_head *head;
+        struct nfs_pageio_descriptor *pgio;
         struct nfs_open_context *ctx;
 };
 
@@ -562,19 +533,21 @@ readpage_async_filler(void *data, struct page *page)
         }
         if (len < PAGE_CACHE_SIZE)
                 memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
-        nfs_list_add_request(new, desc->head);
+        nfs_pageio_add_request(desc->pgio, new);
         return 0;
 }
 
 int nfs_readpages(struct file *filp, struct address_space *mapping,
                 struct list_head *pages, unsigned nr_pages)
 {
-        LIST_HEAD(head);
+        struct nfs_pageio_descriptor pgio;
         struct nfs_readdesc desc = {
-                .head           = &head,
+                .pgio = &pgio,
         };
         struct inode *inode = mapping->host;
         struct nfs_server *server = NFS_SERVER(inode);
+        size_t rsize = server->rsize;
+        unsigned long npages;
         int ret = -ESTALE;
 
         dprintk("NFS: nfs_readpages (%s/%Ld %d)\n",
@@ -593,13 +566,16 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
         } else
                 desc.ctx = get_nfs_open_context((struct nfs_open_context *)
                                 filp->private_data);
+        if (rsize < PAGE_CACHE_SIZE)
+                nfs_pageio_init(&pgio, inode, nfs_pagein_multi, rsize, 0);
+        else
+                nfs_pageio_init(&pgio, inode, nfs_pagein_one, rsize, 0);
+
         ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);
-        if (!list_empty(&head)) {
-                int err = nfs_pagein_list(&head, server->rpages);
-                if (!ret)
-                        nfs_add_stats(inode, NFSIOS_READPAGES, err);
-                        ret = err;
-        }
+
+        nfs_pageio_complete(&pgio);
+        npages = (pgio.pg_bytes_written + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+        nfs_add_stats(inode, NFSIOS_READPAGES, npages);
         put_nfs_open_context(desc.ctx);
 out:
         return ret;