Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / nfs / pagelist.c

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 94e16ec..ed0db61 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -526,7 +526,8 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free);
  */
 void nfs_pgio_data_destroy(struct nfs_pgio_header *hdr)
 {
-       put_nfs_open_context(hdr->args.context);
+       if (hdr->args.context)
+               put_nfs_open_context(hdr->args.context);
        if (hdr->page_array.pagevec != hdr->page_array.page_array)
                kfree(hdr->page_array.pagevec);
 }
@@ -751,12 +752,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
                nfs_list_remove_request(req);
                nfs_list_add_request(req, &hdr->pages);
 
-               if (WARN_ON_ONCE(pageused >= pagecount))
-                       return nfs_pgio_error(desc, hdr);
-
                if (!last_page || last_page != req->wb_page) {
-                       *pages++ = last_page = req->wb_page;
                        pageused++;
+                       if (pageused > pagecount)
+                               break;
+                       *pages++ = last_page = req->wb_page;
                }
        }
        if (WARN_ON_ONCE(pageused != pagecount))