4 files changed, 13 insertions, 13 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 0fd811ac08b5..2d301a1a73e2 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -492,7 +492,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
                         struct nfs_page *req;
                         unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
                         /* XXX do we need to do the eof zeroing found in async_filler? */
-                        req = nfs_create_request(dreq->ctx, pagevec[i], NULL,
+                        req = nfs_create_request(dreq->ctx, pagevec[i],
                                                  pgbase, req_len);
                         if (IS_ERR(req)) {
                                 result = PTR_ERR(req);
@@ -899,7 +899,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
                         struct nfs_page *req;
                         unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
 
-                        req = nfs_create_request(dreq->ctx, pagevec[i], NULL,
+                        req = nfs_create_request(dreq->ctx, pagevec[i],
                                                  pgbase, req_len);
                         if (IS_ERR(req)) {
                                 result = PTR_ERR(req);
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 66a5c5d4a777..b8301c40dd78 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -297,8 +297,8 @@ out:
 
 static struct nfs_page *
 __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
-                   struct nfs_page *last, unsigned int pgbase,
-                   unsigned int offset, unsigned int count)
+                   unsigned int pgbase, unsigned int offset,
+                   unsigned int count)
 {
         struct nfs_page         *req;
         struct nfs_open_context *ctx = l_ctx->open_context;
@@ -327,7 +327,6 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
         req->wb_bytes   = count;
         req->wb_context = get_nfs_open_context(ctx);
         kref_init(&req->wb_kref);
-        nfs_page_group_init(req, last);
         return req;
 }
 
@@ -335,7 +334,6 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
  * nfs_create_request - Create an NFS read/write request.
  * @ctx: open context to use
  * @page: page to write
- * @last: last nfs request created for this page group or NULL if head
  * @offset: starting offset within the page for the write
  * @count: number of bytes to read/write
  *
@@ -345,15 +343,16 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
  */
 struct nfs_page *
 nfs_create_request(struct nfs_open_context *ctx, struct page *page,
-                   struct nfs_page *last, unsigned int offset,
-                   unsigned int count)
+                   unsigned int offset, unsigned int count)
 {
         struct nfs_lock_context *l_ctx = nfs_get_lock_context(ctx);
         struct nfs_page *ret;
 
         if (IS_ERR(l_ctx))
                 return ERR_CAST(l_ctx);
-        ret = __nfs_create_request(l_ctx, page, last, offset, offset, count);
+        ret = __nfs_create_request(l_ctx, page, offset, offset, count);
+        if (!IS_ERR(ret))
+                nfs_page_group_init(ret, NULL);
         nfs_put_lock_context(l_ctx);
         return ret;
 }
@@ -365,11 +364,12 @@ nfs_create_subreq(struct nfs_page *req, struct nfs_page *last,
 {
         struct nfs_page *ret;
 
-        ret = __nfs_create_request(req->wb_lock_context, req->wb_page, last,
+        ret = __nfs_create_request(req->wb_lock_context, req->wb_page,
                         pgbase, offset, count);
         if (!IS_ERR(ret)) {
                 nfs_lock_request(ret);
                 ret->wb_index = req->wb_index;
+                nfs_page_group_init(ret, last);
         }
         return ret;
 }
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 1d95a60b2586..fad1333dbf71 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -118,7 +118,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
         len = nfs_page_length(page);
         if (len == 0)
                 return nfs_return_empty_page(page);
-        new = nfs_create_request(ctx, page, NULL, 0, len);
+        new = nfs_create_request(ctx, page, 0, len);
         if (IS_ERR(new)) {
                 unlock_page(page);
                 return PTR_ERR(new);
@@ -363,7 +363,7 @@ readpage_async_filler(void *data, struct page *page)
         if (len == 0)
                 return nfs_return_empty_page(page);
 
-        new = nfs_create_request(desc->ctx, page, NULL, 0, len);
+        new = nfs_create_request(desc->ctx, page, 0, len);
         if (IS_ERR(new))
                 goto out_error;
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 03cde38ecd31..b9bcbd06a628 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1171,7 +1171,7 @@ static struct nfs_page * nfs_setup_write_request(struct nfs_open_context* ctx,
         req = nfs_try_to_update_request(inode, page, offset, bytes);
         if (req != NULL)
                 goto out;
-        req = nfs_create_request(ctx, page, NULL, offset, bytes);
+        req = nfs_create_request(ctx, page, offset, bytes);
         if (IS_ERR(req))
                 goto out;
         nfs_inode_add_request(inode, req);