Commit 8d863b1f authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Eliminate rpcrdma_post_sends() 



Clean up.

Now that there is only one registration mode, there is only one
target "post_send" method: frwr_send(). rpcrdma_post_sends() no
longer adds much value, especially since all of its call sites
ignore the return code value except to check if it's non-zero.

Just have them call frwr_send() directly instead.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent d9ae8134

net/sunrpc/xprtrdma/backchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int xprt_rdma_bc_send_reply(struct rpc_rqst *rqst) 
	if (rc < 0)

		goto failed_marshal;



	if (rpcrdma_post_sends(r_xprt, req))

	if (frwr_send(r_xprt, req))

		goto drop_connection;

	return 0;

net/sunrpc/xprtrdma/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ xprt_rdma_send_request(struct rpc_rqst *rqst) 
		goto drop_connection;

	rqst->rq_xtime = ktime_get();



	if (rpcrdma_post_sends(r_xprt, req))

	if (frwr_send(r_xprt, req))

		goto drop_connection;



	rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;

net/sunrpc/xprtrdma/verbs.c

+0 −15
Original line number Diff line number Diff line
@@ -1349,21 +1349,6 @@ static void rpcrdma_regbuf_free(struct rpcrdma_regbuf *rb) 
	kfree(rb);

}



/**

 * rpcrdma_post_sends - Post WRs to a transport's Send Queue

 * @r_xprt: controlling transport instance

 * @req: rpcrdma_req containing the Send WR to post

 *

 * Returns 0 if the post was successful, otherwise -ENOTCONN

 * is returned.

 */

int rpcrdma_post_sends(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)

{

	if (frwr_send(r_xprt, req))

		return -ENOTCONN;

	return 0;

}



/**

 * rpcrdma_post_recvs - Refill the Receive Queue

 * @r_xprt: controlling transport instance

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ void rpcrdma_flush_disconnect(struct rpcrdma_xprt *r_xprt, struct ib_wc *wc); 
int rpcrdma_xprt_connect(struct rpcrdma_xprt *r_xprt);

void rpcrdma_xprt_disconnect(struct rpcrdma_xprt *r_xprt);



int rpcrdma_post_sends(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req);

void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp);



/*