NFS: Remove unused argument from nfs_create_request()

All the callers of nfs_create_request() are now creating page group
heads, so we can remove the redundant 'last' page argument.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 0fd811ac08b525d2a5962a168402557a1e01843b..2d301a1a73e23f7057b69aaa31f5ae3f80af62c7 100644 (file)
--- 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 66a5c5d4a77778fcdc4106eb98d34648fdda280a..b8301c40dd78adc945cccd570f580ecf8e44dea9 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -297,8 +297,8 @@ nfs_page_group_destroy(struct kref *kref)
 
 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 1d95a60b2586aede52c7a55b00fe76e921fdf7fe..fad1333dbf71fd49d2bb1a6d4f3da3e4bd175434 100644 (file)
--- 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 03cde38ecd310146d18c8ab4f522ff080a7a4292..b9bcbd06a628d85ed9f2518e77cd289f4f27ac8e 100644 (file)
--- 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);

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index ad69430fd0eb5a9123727e2054682971de3feca3..b7d0f15615c2a0536b0112b653a1bdc863cf24a9 100644 (file)
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -114,7 +114,6 @@ struct nfs_pageio_descriptor {
 
 extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx,
                                            struct page *page,
-                                           struct nfs_page *last,
                                            unsigned int offset,
                                            unsigned int count);
 extern void nfs_release_request(struct nfs_page *);