svcrdma: Remove unused sc_pages field

Clean up. This significantly reduces the size of struct
svc_rdma_send_ctxt.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index 5841978..6e621e1 100644 (file)
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -164,9 +164,8 @@ struct svc_rdma_send_ctxt {
        struct xdr_buf          sc_hdrbuf;
        struct xdr_stream       sc_stream;
        void                    *sc_xprt_buf;
-       int                     sc_page_count;
        int                     sc_cur_sge_no;
-       struct page             *sc_pages[RPCSVC_MAXPAGES];
+
        struct ib_sge           sc_sges[];
 };
 

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 62d5585..f093c9b 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -219,7 +219,6 @@ out:
 
        ctxt->sc_send_wr.num_sge = 0;
        ctxt->sc_cur_sge_no = 0;
-       ctxt->sc_page_count = 0;
        return ctxt;
 
 out_empty:
@@ -234,8 +233,6 @@ out_empty:
  * svc_rdma_send_ctxt_put - Return send_ctxt to free list
  * @rdma: controlling svcxprt_rdma
  * @ctxt: object to return to the free list
- *
- * Pages left in sc_pages are DMA unmapped and released.
  */
 void svc_rdma_send_ctxt_put(struct svcxprt_rdma *rdma,
                            struct svc_rdma_send_ctxt *ctxt)
@@ -256,9 +253,6 @@ void svc_rdma_send_ctxt_put(struct svcxprt_rdma *rdma,
                                             ctxt->sc_sges[i].length);
        }
 
-       for (i = 0; i < ctxt->sc_page_count; ++i)
-               put_page(ctxt->sc_pages[i]);
-
        spin_lock(&rdma->sc_send_lock);
        list_add(&ctxt->sc_list, &rdma->sc_send_ctxts);
        spin_unlock(&rdma->sc_send_lock);
@@ -792,25 +786,6 @@ int svc_rdma_map_reply_msg(struct svcxprt_rdma *rdma,
                                       svc_rdma_xb_dma_map, &args);
 }
 
-/* The svc_rqst and all resources it owns are released as soon as
- * svc_rdma_sendto returns. Transfer pages under I/O to the ctxt
- * so they are released by the Send completion handler.
- */
-static inline void svc_rdma_save_io_pages(struct svc_rqst *rqstp,
-                                  struct svc_rdma_send_ctxt *ctxt)
-{
-       int i, pages = rqstp->rq_next_page - rqstp->rq_respages;
-
-       ctxt->sc_page_count += pages;
-       for (i = 0; i < pages; i++) {
-               ctxt->sc_pages[i] = rqstp->rq_respages[i];
-               rqstp->rq_respages[i] = NULL;
-       }
-
-       /* Prevent svc_xprt_release from releasing pages in rq_pages */
-       rqstp->rq_next_page = rqstp->rq_respages;
-}
-
 /* Prepare the portion of the RPC Reply that will be transmitted
  * via RDMA Send. The RPC-over-RDMA transport header is prepared
  * in sc_sges[0], and the RPC xdr_buf is prepared in following sges.