svcrdma: Update synopsis of svc_rdma_send_reply_chunk()

Preparing for subsequent patches, no behavior change expected.

Pass the RPC Call's svc_rdma_recv_ctxt deeper into the sendto()
path. This enables passing more information about Requester-
provided Write and Reply chunks into the lower-level send
functions.

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 e714e4d90ac535714df96575658b8e6a9e07c169..42b68126cc60ec9585d0a1a5d986ca72ecd98d6f 100644 (file)
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -179,7 +179,7 @@ extern int svc_rdma_send_write_chunk(struct svcxprt_rdma *rdma,
                                     unsigned int offset,
                                     unsigned long length);
 extern int svc_rdma_send_reply_chunk(struct svcxprt_rdma *rdma,
-                                    __be32 *rp_ch, bool writelist,
+                                    const struct svc_rdma_recv_ctxt *rctxt,
                                     struct xdr_buf *xdr);
 
 /* svc_rdma_sendto.c */

diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index 927f98995356da734edbd79b391a78e4dc7e57d2..aee8ee2d01daf54614b2ad15cd269d3ad070f819 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -545,8 +545,7 @@ out_err:
 /**
  * svc_rdma_send_reply_chunk - Write all segments in the Reply chunk
  * @rdma: controlling RDMA transport
- * @rp_ch: Reply chunk provided by client
- * @writelist: true if client provided a Write list
+ * @rctxt: Write and Reply chunks from client
  * @xdr: xdr_buf containing an RPC Reply
  *
  * Returns a non-negative number of bytes the chunk consumed, or
@@ -556,13 +555,14 @@ out_err:
  *     %-ENOTCONN if posting failed (connection is lost),
  *     %-EIO if rdma_rw initialization failed (DMA mapping, etc).
  */
-int svc_rdma_send_reply_chunk(struct svcxprt_rdma *rdma, __be32 *rp_ch,
-                             bool writelist, struct xdr_buf *xdr)
+int svc_rdma_send_reply_chunk(struct svcxprt_rdma *rdma,
+                             const struct svc_rdma_recv_ctxt *rctxt,
+                             struct xdr_buf *xdr)
 {
        struct svc_rdma_write_info *info;
        int consumed, ret;
 
-       info = svc_rdma_write_info_alloc(rdma, rp_ch);
+       info = svc_rdma_write_info_alloc(rdma, rctxt->rc_reply_chunk);
        if (!info)
                return -ENOMEM;
 
@@ -574,7 +574,7 @@ int svc_rdma_send_reply_chunk(struct svcxprt_rdma *rdma, __be32 *rp_ch,
        /* Send the page list in the Reply chunk only if the
         * client did not provide Write chunks.
         */
-       if (!writelist && xdr->page_len) {
+       if (!rctxt->rc_write_list && xdr->page_len) {
                ret = svc_rdma_send_xdr_pagelist(info, xdr,
                                                 xdr->head[0].iov_len,
                                                 xdr->page_len);

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 94895635c0078e40d8a044e09f9bfe53caf450a2..0b6ff55b1ab18670ad6209e36f0daa258c6dbc0c 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -833,7 +833,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
                svc_rdma_xdr_encode_write_list(rdma_resp, wr_lst, ret);
        }
        if (rp_ch) {
-               ret = svc_rdma_send_reply_chunk(rdma, rp_ch, wr_lst, xdr);
+               ret = svc_rdma_send_reply_chunk(rdma, rctxt, &rqstp->rq_res);
                if (ret < 0)
                        goto err2;
                svc_rdma_xdr_encode_reply_chunk(rdma_resp, rp_ch, ret);