Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

xprtrdma: Simplify rpcrdma_ep_post_recv() 



Clean up.

Since commit fc664485 ("xprtrdma: Split the completion queue"),
rpcrdma_ep_post_recv() no longer uses the "ep" argument.

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

net/sunrpc/xprtrdma/backchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ void rpcrdma_bc_receive_call(struct rpcrdma_xprt *r_xprt, 
out_short:

	pr_warn("RPC/RDMA short backward direction call\n");



	if (rpcrdma_ep_post_recv(&r_xprt->rx_ia, &r_xprt->rx_ep, rep))

	if (rpcrdma_ep_post_recv(&r_xprt->rx_ia, rep))

		xprt_disconnect_done(xprt);

	else

		pr_warn("RPC:       %s: reposting rep %p\n",

net/sunrpc/xprtrdma/rpc_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1141,6 +1141,6 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) 


repost:

	r_xprt->rx_stats.bad_reply_count++;

	if (rpcrdma_ep_post_recv(&r_xprt->rx_ia, &r_xprt->rx_ep, rep))

	if (rpcrdma_ep_post_recv(&r_xprt->rx_ia, rep))

		rpcrdma_recv_buffer_put(rep);

}

net/sunrpc/xprtrdma/verbs.c

+2 −7
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia, 
	int i, rc;



	if (rep) {

		rc = rpcrdma_ep_post_recv(ia, ep, rep);

		rc = rpcrdma_ep_post_recv(ia, rep);

		if (rc)

			return rc;

		req->rl_reply = NULL;
@@ -1300,12 +1300,8 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia, 
	return -ENOTCONN;

}



/*

 * (Re)post a receive buffer.

 */

int

rpcrdma_ep_post_recv(struct rpcrdma_ia *ia,

		     struct rpcrdma_ep *ep,

		     struct rpcrdma_rep *rep)

{

	struct ib_recv_wr recv_wr, *recv_wr_fail;
@@ -1344,7 +1340,6 @@ rpcrdma_ep_post_extra_recv(struct rpcrdma_xprt *r_xprt, unsigned int count) 
{

	struct rpcrdma_buffer *buffers = &r_xprt->rx_buf;

	struct rpcrdma_ia *ia = &r_xprt->rx_ia;

	struct rpcrdma_ep *ep = &r_xprt->rx_ep;

	struct rpcrdma_rep *rep;

	int rc;
@@ -1355,7 +1350,7 @@ rpcrdma_ep_post_extra_recv(struct rpcrdma_xprt *r_xprt, unsigned int count) 
		rep = rpcrdma_buffer_get_rep_locked(buffers);

		spin_unlock(&buffers->rb_lock);



		rc = rpcrdma_ep_post_recv(ia, ep, rep);

		rc = rpcrdma_ep_post_recv(ia, rep);

		if (rc)

			goto out_rc;

	}

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −2
Original line number Diff line number Diff line
@@ -457,8 +457,7 @@ void rpcrdma_ep_disconnect(struct rpcrdma_ep *, struct rpcrdma_ia *); 


int rpcrdma_ep_post(struct rpcrdma_ia *, struct rpcrdma_ep *,

				struct rpcrdma_req *);

int rpcrdma_ep_post_recv(struct rpcrdma_ia *, struct rpcrdma_ep *,

				struct rpcrdma_rep *);

int rpcrdma_ep_post_recv(struct rpcrdma_ia *, struct rpcrdma_rep *);



/*

 * Buffer calls - xprtrdma/verbs.c