SUNRPC: set rq_page_end differently

[linux-2.6-microblaze.git] / net / sunrpc / svc_xprt.c

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 42565f0..63eb6b9 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -661,7 +661,7 @@ static void svc_check_conn_limits(struct svc_serv *serv)
 static int svc_alloc_arg(struct svc_rqst *rqstp)
 {
        struct svc_serv *serv = rqstp->rq_server;
-       struct xdr_buf *arg;
+       struct xdr_buf *arg = &rqstp->rq_arg;
        int pages;
        int i;
 
@@ -686,11 +686,10 @@ static int svc_alloc_arg(struct svc_rqst *rqstp)
                        }
                        rqstp->rq_pages[i] = p;
                }
-       rqstp->rq_page_end = &rqstp->rq_pages[i];
-       rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */
+       rqstp->rq_page_end = &rqstp->rq_pages[pages];
+       rqstp->rq_pages[pages] = NULL; /* this might be seen in nfsd_splice_actor() */
 
        /* Make arg->head point to first page and arg->pages point to rest */
-       arg = &rqstp->rq_arg;
        arg->head[0].iov_base = page_address(rqstp->rq_pages[0]);
        arg->head[0].iov_len = PAGE_SIZE;
        arg->pages = rqstp->rq_pages + 1;