svcrdma: Move struct svc_rdma_chunk_ctxt to svc_rdma.h

Prepare for nestling these into the send and recv ctxts so they
no longer have to be allocated dynamically.

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 ab250017b99f35fb9a9fb9b916360e5e84074341..50c4f18a9b7feeb66432d906ee83af562db60963 100644 (file)
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -127,6 +127,21 @@ enum {
 
 #define RPCSVC_MAXPAYLOAD_RDMA RPCSVC_MAXPAYLOAD
 
+/*
+ * A chunk context tracks all I/O for moving one Read or Write
+ * chunk. This is a set of rdma_rw's that handle data movement
+ * for all segments of one chunk.
+ */
+struct svc_rdma_chunk_ctxt {
+       struct rpc_rdma_cid     cc_cid;
+       struct ib_cqe           cc_cqe;
+       struct list_head        cc_rwctxts;
+       ktime_t                 cc_posttime;
+       int                     cc_sqecount;
+       enum ib_wc_status       cc_status;
+       struct completion       cc_done;
+};
+
 struct svc_rdma_recv_ctxt {
        struct llist_node       rc_node;
        struct list_head        rc_list;

diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index cfa5973c9277d36ac4ab1ab29db68bf9d92034f9..1de56e9fea91b5ab293a87540d2f1d447469f547 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -146,24 +146,6 @@ static int svc_rdma_rw_ctx_init(struct svcxprt_rdma *rdma,
        return ret;
 }
 
-/* A chunk context tracks all I/O for moving one Read or Write
- * chunk. This is a set of rdma_rw's that handle data movement
- * for all segments of one chunk.
- *
- * These are small, acquired with a single allocator call, and
- * no more than one is needed per chunk. They are allocated on
- * demand, and not cached.
- */
-struct svc_rdma_chunk_ctxt {
-       struct rpc_rdma_cid     cc_cid;
-       struct ib_cqe           cc_cqe;
-       struct list_head        cc_rwctxts;
-       ktime_t                 cc_posttime;
-       int                     cc_sqecount;
-       enum ib_wc_status       cc_status;
-       struct completion       cc_done;
-};
-
 static void svc_rdma_cc_cid_init(struct svcxprt_rdma *rdma,
                                 struct rpc_rdma_cid *cid)
 {