Commit 28ee0ec8 authored by Chuck Lever's avatar Chuck Lever
Browse files

svcrdma: De-duplicate completion ID initialization helpers 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 018f3405

include/linux/sunrpc/svc_rdma.h

+24 −0
Original line number Diff line number Diff line
@@ -134,6 +134,30 @@ enum { 


#define RPCSVC_MAXPAYLOAD_RDMA	RPCSVC_MAXPAYLOAD



/**

 * svc_rdma_send_cid_init - Initialize a Receive Queue completion ID

 * @rdma: controlling transport

 * @cid: completion ID to initialize

 */

static inline void svc_rdma_recv_cid_init(struct svcxprt_rdma *rdma,

					  struct rpc_rdma_cid *cid)

{

	cid->ci_queue_id = rdma->sc_rq_cq->res.id;

	cid->ci_completion_id = atomic_inc_return(&rdma->sc_completion_ids);

}



/**

 * svc_rdma_send_cid_init - Initialize a Send Queue completion ID

 * @rdma: controlling transport

 * @cid: completion ID to initialize

 */

static inline void svc_rdma_send_cid_init(struct svcxprt_rdma *rdma,

					  struct rpc_rdma_cid *cid)

{

	cid->ci_queue_id = rdma->sc_sq_cq->res.id;

	cid->ci_completion_id = atomic_inc_return(&rdma->sc_completion_ids);

}



/*

 * 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

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+0 −7
Original line number Diff line number Diff line
@@ -115,13 +115,6 @@ svc_rdma_next_recv_ctxt(struct list_head *list) 
					rc_list);

}



static void svc_rdma_recv_cid_init(struct svcxprt_rdma *rdma,

				   struct rpc_rdma_cid *cid)

{

	cid->ci_queue_id = rdma->sc_rq_cq->res.id;

	cid->ci_completion_id = atomic_inc_return(&rdma->sc_completion_ids);

}



static struct svc_rdma_recv_ctxt *

svc_rdma_recv_ctxt_alloc(struct svcxprt_rdma *rdma)

{

net/sunrpc/xprtrdma/svc_rdma_rw.c

+1 −8
Original line number Diff line number Diff line
@@ -146,13 +146,6 @@ static int svc_rdma_rw_ctx_init(struct svcxprt_rdma *rdma, 
	return ret;

}



static void svc_rdma_cc_cid_init(struct svcxprt_rdma *rdma,

				 struct rpc_rdma_cid *cid)

{

	cid->ci_queue_id = rdma->sc_sq_cq->res.id;

	cid->ci_completion_id = atomic_inc_return(&rdma->sc_completion_ids);

}



/**

 * svc_rdma_cc_init - Initialize an svc_rdma_chunk_ctxt

 * @rdma: controlling transport instance
@@ -161,7 +154,7 @@ static void svc_rdma_cc_cid_init(struct svcxprt_rdma *rdma, 
void svc_rdma_cc_init(struct svcxprt_rdma *rdma,

		      struct svc_rdma_chunk_ctxt *cc)

{

	svc_rdma_cc_cid_init(rdma, &cc->cc_cid);

	svc_rdma_send_cid_init(rdma, &cc->cc_cid);



	INIT_LIST_HEAD(&cc->cc_rwctxts);

	cc->cc_sqecount = 0;

net/sunrpc/xprtrdma/svc_rdma_sendto.c

+0 −7
Original line number Diff line number Diff line
@@ -113,13 +113,6 @@ 


static void svc_rdma_wc_send(struct ib_cq *cq, struct ib_wc *wc);



static void svc_rdma_send_cid_init(struct svcxprt_rdma *rdma,

				   struct rpc_rdma_cid *cid)

{

	cid->ci_queue_id = rdma->sc_sq_cq->res.id;

	cid->ci_completion_id = atomic_inc_return(&rdma->sc_completion_ids);

}



static struct svc_rdma_send_ctxt *

svc_rdma_send_ctxt_alloc(struct svcxprt_rdma *rdma)

{