1 files changed, 29 insertions, 18 deletions

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index e54d899c1848..e9f39fa5964b 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -350,7 +350,7 @@ nfs_create_request(struct nfs_open_context *ctx, struct page *page,
 
 /**
  * nfs_unlock_request - Unlock request and wake up sleepers.
- * @req:
+ * @req: pointer to request
  */
 void nfs_unlock_request(struct nfs_page *req)
 {
@@ -368,7 +368,7 @@ void nfs_unlock_request(struct nfs_page *req)
 
 /**
  * nfs_unlock_and_release_request - Unlock request and release the nfs_page
- * @req:
+ * @req: pointer to request
  */
 void nfs_unlock_and_release_request(struct nfs_page *req)
 {
@@ -531,7 +531,6 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free);
  * nfs_pgio_rpcsetup - Set up arguments for a pageio call
  * @hdr: The pageio hdr
  * @count: Number of bytes to read
- * @offset: Initial offset
  * @how: How to commit data (writes only)
  * @cinfo: Commit information for the call (writes only)
  */
@@ -634,7 +633,6 @@ EXPORT_SYMBOL_GPL(nfs_initiate_pgio);
 
 /**
  * nfs_pgio_error - Clean up from a pageio error
- * @desc: IO descriptor
  * @hdr: pageio header
  */
 static void nfs_pgio_error(struct nfs_pgio_header *hdr)
@@ -768,8 +766,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
         pageused = 0;
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
-                nfs_list_remove_request(req);
-                nfs_list_add_request(req, &hdr->pages);
+                nfs_list_move_request(req, &hdr->pages);
 
                 if (!last_page || last_page != req->wb_page) {
                         pageused++;
@@ -893,6 +890,7 @@ static bool nfs_match_lock_context(const struct nfs_lock_context *l1,
  * nfs_can_coalesce_requests - test two requests for compatibility
  * @prev: pointer to nfs_page
  * @req: pointer to nfs_page
+ * @pgio: pointer to nfs_pagio_descriptor
  *
  * The nfs_page structures 'prev' and 'req' are compared to ensure that the
  * page data area they describe is contiguous, and that their RPC
@@ -961,8 +959,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
         }
         if (!nfs_can_coalesce_requests(prev, req, desc))
                 return 0;
-        nfs_list_remove_request(req);
-        nfs_list_add_request(req, &mirror->pg_list);
+        nfs_list_move_request(req, &mirror->pg_list);
         mirror->pg_count += req->wb_bytes;
         return 1;
 }
@@ -988,6 +985,16 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
         }
 }
 
+static void
+nfs_pageio_cleanup_request(struct nfs_pageio_descriptor *desc,
+                struct nfs_page *req)
+{
+        LIST_HEAD(head);
+
+        nfs_list_move_request(req, &head);
+        desc->pg_completion_ops->error_cleanup(&head, desc->pg_error);
+}
+
 /**
  * nfs_pageio_add_request - Attempt to coalesce a request into a page list.
  * @desc: destination io descriptor
@@ -1025,10 +1032,8 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
                         nfs_page_group_unlock(req);
                         desc->pg_moreio = 1;
                         nfs_pageio_doio(desc);
-                        if (desc->pg_error < 0)
-                                return 0;
-                        if (mirror->pg_recoalesce)
-                                return 0;
+                        if (desc->pg_error < 0 || mirror->pg_recoalesce)
+                                goto out_cleanup_subreq;
                         /* retry add_request for this subreq */
                         nfs_page_group_lock(req);
                         continue;
@@ -1061,6 +1066,10 @@ err_ptr:
         desc->pg_error = PTR_ERR(subreq);
         nfs_page_group_unlock(req);
         return 0;
+out_cleanup_subreq:
+        if (req != subreq)
+                nfs_pageio_cleanup_request(desc, subreq);
+        return 0;
 }
 
 static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
@@ -1079,7 +1088,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
                         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) {
@@ -1120,7 +1128,8 @@ static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)
 
         for (midx = 0; midx < desc->pg_mirror_count; midx++) {
                 mirror = &desc->pg_mirrors[midx];
-                desc->pg_completion_ops->error_cleanup(&mirror->pg_list);
+                desc->pg_completion_ops->error_cleanup(&mirror->pg_list,
+                                desc->pg_error);
         }
 }
 
@@ -1168,11 +1177,14 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
                 if (nfs_pgio_has_mirroring(desc))
                         desc->pg_mirror_idx = midx;
                 if (!nfs_pageio_add_request_mirror(desc, dupreq))
-                        goto out_failed;
+                        goto out_cleanup_subreq;
         }
 
         return 1;
 
+out_cleanup_subreq:
+        if (req != dupreq)
+                nfs_pageio_cleanup_request(desc, dupreq);
 out_failed:
         nfs_pageio_error_cleanup(desc);
         return 0;
@@ -1194,7 +1206,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,
                 desc->pg_mirror_idx = mirror_idx;
         for (;;) {
                 nfs_pageio_doio(desc);
-                if (!mirror->pg_recoalesce)
+                if (desc->pg_error < 0 || !mirror->pg_recoalesce)
                         break;
                 if (!nfs_do_recoalesce(desc))
                         break;
@@ -1222,9 +1234,8 @@ int nfs_pageio_resend(struct nfs_pageio_descriptor *desc,
         while (!list_empty(&hdr->pages)) {
                 struct nfs_page *req = nfs_list_entry(hdr->pages.next);
 
-                nfs_list_remove_request(req);
                 if (!nfs_pageio_add_request(desc, req))
-                        nfs_list_add_request(req, &failed);
+                        nfs_list_move_request(req, &failed);
         }
         nfs_pageio_complete(desc);
         if (!list_empty(&failed)) {