1 files changed, 64 insertions, 12 deletions

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 7913961aff22..b60970cc7f1f 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -114,7 +114,7 @@ int nfs_set_page_tag_locked(struct nfs_page *req)
         if (!nfs_lock_request_dontget(req))
                 return 0;
         if (test_bit(PG_MAPPED, &req->wb_flags))
-                radix_tree_tag_set(&NFS_I(req->wb_context->path.dentry->d_inode)->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
+                radix_tree_tag_set(&NFS_I(req->wb_context->dentry->d_inode)->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED);
         return 1;
 }
 
@@ -124,7 +124,7 @@ int nfs_set_page_tag_locked(struct nfs_page *req)
 void nfs_clear_page_tag_locked(struct nfs_page *req)
 {
         if (test_bit(PG_MAPPED, &req->wb_flags)) {
-                struct inode *inode = req->wb_context->path.dentry->d_inode;
+                struct inode *inode = req->wb_context->dentry->d_inode;
                 struct nfs_inode *nfsi = NFS_I(inode);
 
                 spin_lock(&inode->i_lock);
@@ -204,7 +204,7 @@ nfs_wait_on_request(struct nfs_page *req)
                         TASK_UNINTERRUPTIBLE);
 }
 
-static bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_page *prev, struct nfs_page *req)
+bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_page *prev, struct nfs_page *req)
 {
         /*
          * FIXME: ideally we should be able to coalesce all requests
@@ -218,6 +218,7 @@ static bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_p
 
         return desc->pg_count + req->wb_bytes <= desc->pg_bsize;
 }
+EXPORT_SYMBOL_GPL(nfs_generic_pg_test);
 
 /**
  * nfs_pageio_init - initialise a page io descriptor
@@ -229,7 +230,7 @@ static bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc, struct nfs_p
  */
 void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
                      struct inode *inode,
-                     int (*doio)(struct nfs_pageio_descriptor *),
+                     const struct nfs_pageio_ops *pg_ops,
                      size_t bsize,
                      int io_flags)
 {
@@ -239,13 +240,12 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
         desc->pg_bsize = bsize;
         desc->pg_base = 0;
         desc->pg_moreio = 0;
+        desc->pg_recoalesce = 0;
         desc->pg_inode = inode;
-        desc->pg_doio = doio;
+        desc->pg_ops = pg_ops;
         desc->pg_ioflags = io_flags;
         desc->pg_error = 0;
         desc->pg_lseg = NULL;
-        desc->pg_test = nfs_generic_pg_test;
-        pnfs_pageio_init(desc, inode);
 }
 
 /**
@@ -275,7 +275,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
                 return false;
         if (prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)
                 return false;
-        return pgio->pg_test(pgio, prev, req);
+        return pgio->pg_ops->pg_test(pgio, prev, req);
 }
 
 /**
@@ -296,6 +296,8 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
                 if (!nfs_can_coalesce_requests(prev, req, desc))
                         return 0;
         } else {
+                if (desc->pg_ops->pg_init)
+                        desc->pg_ops->pg_init(desc, req);
                 desc->pg_base = req->wb_pgbase;
         }
         nfs_list_remove_request(req);
@@ -310,7 +312,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
 static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
 {
         if (!list_empty(&desc->pg_list)) {
-                int error = desc->pg_doio(desc);
+                int error = desc->pg_ops->pg_doio(desc);
                 if (error < 0)
                         desc->pg_error = error;
                 else
@@ -330,7 +332,7 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
  * Returns true if the request 'req' was successfully coalesced into the
  * existing list of pages 'desc'.
  */
-int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
+static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
                            struct nfs_page *req)
 {
         while (!nfs_pageio_do_add_request(desc, req)) {
@@ -339,17 +341,67 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
                 if (desc->pg_error < 0)
                         return 0;
                 desc->pg_moreio = 0;
+                if (desc->pg_recoalesce)
+                        return 0;
         }
         return 1;
 }
 
+static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
+{
+        LIST_HEAD(head);
+
+        do {
+                list_splice_init(&desc->pg_list, &head);
+                desc->pg_bytes_written -= desc->pg_count;
+                desc->pg_count = 0;
+                desc->pg_base = 0;
+                desc->pg_recoalesce = 0;
+
+                while (!list_empty(&head)) {
+                        struct nfs_page *req;
+
+                        req = list_first_entry(&head, struct nfs_page, wb_list);
+                        nfs_list_remove_request(req);
+                        if (__nfs_pageio_add_request(desc, req))
+                                continue;
+                        if (desc->pg_error < 0)
+                                return 0;
+                        break;
+                }
+        } while (desc->pg_recoalesce);
+        return 1;
+}
+
+int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
+                struct nfs_page *req)
+{
+        int ret;
+
+        do {
+                ret = __nfs_pageio_add_request(desc, req);
+                if (ret)
+                        break;
+                if (desc->pg_error < 0)
+                        break;
+                ret = nfs_do_recoalesce(desc);
+        } while (ret);
+        return ret;
+}
+
 /**
  * nfs_pageio_complete - Complete I/O on an nfs_pageio_descriptor
  * @desc: pointer to io descriptor
  */
 void nfs_pageio_complete(struct nfs_pageio_descriptor *desc)
 {
-        nfs_pageio_doio(desc);
+        for (;;) {
+                nfs_pageio_doio(desc);
+                if (!desc->pg_recoalesce)
+                        break;
+                if (!nfs_do_recoalesce(desc))
+                        break;
+        }
 }
 
 /**
@@ -368,7 +420,7 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index)
         if (!list_empty(&desc->pg_list)) {
                 struct nfs_page *prev = nfs_list_entry(desc->pg_list.prev);
                 if (index != prev->wb_index + 1)
-                        nfs_pageio_doio(desc);
+                        nfs_pageio_complete(desc);
         }
 }