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

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

xprtrdma: Simplify rpcrdma_deregister_external() synopsis 



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

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent cdd9ade7

net/sunrpc/xprtrdma/rpc_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ rpcrdma_create_chunks(struct rpc_rqst *rqst, struct xdr_buf *target, 
out:

	for (pos = 0; nchunks--;)

		pos += rpcrdma_deregister_external(

				&req->rl_segments[pos], r_xprt, NULL);

				&req->rl_segments[pos], r_xprt);

	return 0;

}

net/sunrpc/xprtrdma/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ xprt_rdma_free(void *buffer) 
	for (i = 0; req->rl_nchunks;) {

		--req->rl_nchunks;

		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 */

net/sunrpc/xprtrdma/verbs.c

+1 −7
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ rpcrdma_register_external(struct rpcrdma_mr_seg *seg, 


int

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;

	int nsegs = seg->mr_nsegs, rc;
@@ -1658,12 +1658,6 @@ rpcrdma_deregister_external(struct rpcrdma_mr_seg *seg, 
	default:

		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;

}

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ int rpcrdma_deregister_internal(struct rpcrdma_ia *, 
int rpcrdma_register_external(struct rpcrdma_mr_seg *,

				int, int, struct rpcrdma_xprt *);

int rpcrdma_deregister_external(struct rpcrdma_mr_seg *,

				struct rpcrdma_xprt *, void *);

				struct rpcrdma_xprt *);



/*

 * RPC/RDMA connection management calls - xprtrdma/rpc_rdma.c