redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

xprtrdma: Simplify rpcrdma_ep_post_recv() 

Clean up.

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
hifive-unleashed-5.1
Chuck Lever 2016-09-15 10:56:35 -04:00 committed by Anna Schumaker
parent 13650c23f1
commit b157380af1
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/sunrpc/xprtrdma/backchannel.c
View File

@ -397,7 +397,7 @@ out_overflow:
out_short: out_short:
pr_warn("RPC/RDMA short backward direction call\n"); 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); xprt_disconnect_done(xprt);
else else
pr_warn("RPC: %s: reposting rep %p\n", pr_warn("RPC: %s: reposting rep %p\n",

2
net/sunrpc/xprtrdma/rpc_rdma.c
View File

@ -1141,6 +1141,6 @@ out_duplicate:
repost: repost:
r_xprt->rx_stats.bad_reply_count++; 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); rpcrdma_recv_buffer_put(rep);
} }

9
net/sunrpc/xprtrdma/verbs.c
View File

@ -1265,7 +1265,7 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia,
int i, rc; int i, rc;
if (rep) { if (rep) {
rc = rpcrdma_ep_post_recv(ia, ep, rep); rc = rpcrdma_ep_post_recv(ia, rep);
if (rc) if (rc)
return rc; return rc;
req->rl_reply = NULL; req->rl_reply = NULL;
@ -1300,12 +1300,8 @@ out_postsend_err:
return -ENOTCONN; return -ENOTCONN;
} }
/*
* (Re)post a receive buffer.
*/
int int
rpcrdma_ep_post_recv(struct rpcrdma_ia *ia, rpcrdma_ep_post_recv(struct rpcrdma_ia *ia,
struct rpcrdma_ep *ep,
struct rpcrdma_rep *rep) struct rpcrdma_rep *rep)
{ {
struct ib_recv_wr recv_wr, *recv_wr_fail; 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_buffer *buffers = &r_xprt->rx_buf;
struct rpcrdma_ia *ia = &r_xprt->rx_ia; struct rpcrdma_ia *ia = &r_xprt->rx_ia;
struct rpcrdma_ep *ep = &r_xprt->rx_ep;
struct rpcrdma_rep *rep; struct rpcrdma_rep *rep;
int rc; 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); rep = rpcrdma_buffer_get_rep_locked(buffers);
spin_unlock(&buffers->rb_lock); spin_unlock(&buffers->rb_lock);
rc = rpcrdma_ep_post_recv(ia, ep, rep); rc = rpcrdma_ep_post_recv(ia, rep);
if (rc) if (rc)
goto out_rc; goto out_rc;
} }

3
net/sunrpc/xprtrdma/xprt_rdma.h
View File

@ -457,8 +457,7 @@ void rpcrdma_ep_disconnect(struct rpcrdma_ep *, struct rpcrdma_ia *);
int rpcrdma_ep_post(struct rpcrdma_ia *, struct rpcrdma_ep *, int rpcrdma_ep_post(struct rpcrdma_ia *, struct rpcrdma_ep *,
struct rpcrdma_req *); struct rpcrdma_req *);
int rpcrdma_ep_post_recv(struct rpcrdma_ia *, struct rpcrdma_ep *, int rpcrdma_ep_post_recv(struct rpcrdma_ia *, struct rpcrdma_rep *);
struct rpcrdma_rep *);
/* /*
* Buffer calls - xprtrdma/verbs.c * Buffer calls - xprtrdma/verbs.c