nfsd4: cleanup: replace rq_resused count by rq_next_page pointer

It may be a matter of personal taste, but I find this makes the code
clearer.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

4 files changed, 11 insertions, 7 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 529400d59755..c6abf1a6ba95 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1297,7 +1297,7 @@ svc_process(struct svc_rqst *rqstp)
          * Setup response xdr_buf.
          * Initially it has just one page
          */
-        rqstp->rq_resused = 1;
+        rqstp->rq_next_page = &rqstp->rq_respages[1];
         resv->iov_base = page_address(rqstp->rq_respages[0]);
         resv->iov_len = 0;
         rqstp->rq_res.pages = rqstp->rq_respages + 1;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index d8e5adfeac30..dcd5669c5154 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -601,6 +601,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
                 rqstp->rq_respages = rqstp->rq_pages + 1 +
                         DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE);
         }
+        rqstp->rq_next_page = rqstp->rq_respages+1;
 
         if (serv->sv_stats)
                 serv->sv_stats->netudpcnt++;
@@ -1066,6 +1067,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
                                                 svsk->sk_datalen + want);
 
         rqstp->rq_respages = &rqstp->rq_pages[pnum];
+        rqstp->rq_next_page = rqstp->rq_respages + 1;
 
         /* Now receive data */
         len = svc_partial_recvfrom(rqstp, vec, pnum, want, base);
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 41cb63b623df..0ce75524ed21 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -521,11 +521,11 @@ next_sge:
                 rqstp->rq_pages[ch_no] = NULL;
 
         /*
-         * Detach res pages. svc_release must see a resused count of
-         * zero or it will attempt to put them.
+         * Detach res pages. If svc_release sees any it will attempt to
+         * put them.
          */
-        while (rqstp->rq_resused)
-                rqstp->rq_respages[--rqstp->rq_resused] = NULL;
+        while (rqstp->rq_next_page != rqstp->rq_respages)
+                *(--rqstp->rq_next_page) = NULL;
 
         return err;
 }
@@ -550,7 +550,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
 
         /* rq_respages starts after the last arg page */
         rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
-        rqstp->rq_resused = 0;
+        rqstp->rq_next_page = &rqstp->rq_arg.pages[page_no];
 
         /* Rebuild rq_arg head and tail. */
         rqstp->rq_arg.head[0] = head->arg.head[0];
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 42eb7ba0b903..c1d124dc772b 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -548,6 +548,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
         int sge_no;
         int sge_bytes;
         int page_no;
+        int pages;
         int ret;
 
         /* Post a recv buffer to handle another request. */
@@ -611,7 +612,8 @@ static int send_reply(struct svcxprt_rdma *rdma,
          * respages array. They are our pages until the I/O
          * completes.
          */
-        for (page_no = 0; page_no < rqstp->rq_resused; page_no++) {
+        pages = rqstp->rq_next_page - rqstp->rq_respages;
+        for (page_no = 0; page_no < pages; page_no++) {
                 ctxt->pages[page_no+1] = rqstp->rq_respages[page_no];
                 ctxt->count++;
                 rqstp->rq_respages[page_no] = NULL;