android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xprtrdma: Simplify rpcrdma_deregister_external() synopsis

Browse Source 
Clean up: All remaining callers of rpcrdma_deregister_external()
pass NULL as the last argument, so remove that argument.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Chuck Lever 2014-05-28 10:33:08 -04:00 committed by Anna Schumaker
parent cdd9ade711
commit 13c9ff8f67
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ rpcrdma_create_chunks(struct rpc_rqst *rqst, struct xdr_buf *target,
out: out:
for (pos = 0; nchunks--;) for (pos = 0; nchunks--;)
pos += rpcrdma_deregister_external( pos += rpcrdma_deregister_external(
&req->rl_segments[pos], r_xprt, NULL); &req->rl_segments[pos], r_xprt);
return 0; return 0;
} }

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

@ -575,7 +575,7 @@ xprt_rdma_free(void *buffer)
for (i = 0; req->rl_nchunks;) { for (i = 0; req->rl_nchunks;) {
--req->rl_nchunks; --req->rl_nchunks;
i += rpcrdma_deregister_external( i += rpcrdma_deregister_external(
&req->rl_segments[i], r_xprt, NULL); &req->rl_segments[i], r_xprt);
} }
if (req->rl_iov.length == 0) { /* see allocate above */ if (req->rl_iov.length == 0) { /* see allocate above */

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

@ -1632,7 +1632,7 @@ rpcrdma_register_external(struct rpcrdma_mr_seg *seg,
int int
rpcrdma_deregister_external(struct rpcrdma_mr_seg *seg, rpcrdma_deregister_external(struct rpcrdma_mr_seg *seg,
struct rpcrdma_xprt *r_xprt, void *r) struct rpcrdma_xprt *r_xprt)
{ {
struct rpcrdma_ia *ia = &r_xprt->rx_ia; struct rpcrdma_ia *ia = &r_xprt->rx_ia;
int nsegs = seg->mr_nsegs, rc; int nsegs = seg->mr_nsegs, rc;
@ -1658,12 +1658,6 @@ rpcrdma_deregister_external(struct rpcrdma_mr_seg *seg,
default: default:
break; break;
} }
if (r) {
struct rpcrdma_rep *rep = r;
void (*func)(struct rpcrdma_rep *) = rep->rr_func;
rep->rr_func = NULL;
func(rep); /* dereg done, callback now */
}
return nsegs; return nsegs;
} }

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

@ -331,7 +331,7 @@ int rpcrdma_deregister_internal(struct rpcrdma_ia *,
int rpcrdma_register_external(struct rpcrdma_mr_seg *, int rpcrdma_register_external(struct rpcrdma_mr_seg *,
int, int, struct rpcrdma_xprt *); int, int, struct rpcrdma_xprt *);
int rpcrdma_deregister_external(struct rpcrdma_mr_seg *, int rpcrdma_deregister_external(struct rpcrdma_mr_seg *,
struct rpcrdma_xprt *, void *); struct rpcrdma_xprt *);
/* /*
* RPC/RDMA connection management calls - xprtrdma/rpc_rdma.c * RPC/RDMA connection management calls - xprtrdma/rpc_rdma.c