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

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

xprtrdma: Make rpcrdma_ep_destroy() return void 



Clean up: rpcrdma_ep_destroy() returns a value that is used
only to print a debugging message. rpcrdma_ep_destroy() already
prints debugging messages in all error cases.

Make rpcrdma_ep_destroy() return void instead.

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 13c9ff8f

net/sunrpc/xprtrdma/transport.c

+2 −6
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ static void 
xprt_rdma_destroy(struct rpc_xprt *xprt)

{

	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);

	int rc;



	dprintk("RPC:       %s: called\n", __func__);
@@ -238,10 +237,7 @@ xprt_rdma_destroy(struct rpc_xprt *xprt) 
	xprt_clear_connected(xprt);



	rpcrdma_buffer_destroy(&r_xprt->rx_buf);

	rc = rpcrdma_ep_destroy(&r_xprt->rx_ep, &r_xprt->rx_ia);

	if (rc)

		dprintk("RPC:       %s: rpcrdma_ep_destroy returned %i\n",

			__func__, rc);

	rpcrdma_ep_destroy(&r_xprt->rx_ep, &r_xprt->rx_ia);

	rpcrdma_ia_close(&r_xprt->rx_ia);



	xprt_rdma_free_addresses(xprt);
@@ -391,7 +387,7 @@ xprt_setup_rdma(struct xprt_create *args) 
	xprt_rdma_free_addresses(xprt);

	rc = -EINVAL;

out3:

	(void) rpcrdma_ep_destroy(new_ep, &new_xprt->rx_ia);

	rpcrdma_ep_destroy(new_ep, &new_xprt->rx_ia);

out2:

	rpcrdma_ia_close(&new_xprt->rx_ia);

out1:

net/sunrpc/xprtrdma/verbs.c

+1 −6
Original line number Diff line number Diff line
@@ -748,11 +748,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
 * Disconnect and destroy endpoint. After this, the only

 * valid operations on the ep are to free it (if dynamically

 * allocated) or re-create it.

 *

 * The caller's error handling must be sure to not leak the endpoint

 * if this function fails.

 */

int

void

rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)

{

	int rc;
@@ -782,8 +779,6 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
	if (rc)

		dprintk("RPC:       %s: ib_destroy_cq returned %i\n",

			__func__, rc);



	return rc;

}



/*

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void rpcrdma_ia_close(struct rpcrdma_ia *); 
 */

int rpcrdma_ep_create(struct rpcrdma_ep *, struct rpcrdma_ia *,

				struct rpcrdma_create_data_internal *);

int rpcrdma_ep_destroy(struct rpcrdma_ep *, struct rpcrdma_ia *);

void rpcrdma_ep_destroy(struct rpcrdma_ep *, struct rpcrdma_ia *);

int rpcrdma_ep_connect(struct rpcrdma_ep *, struct rpcrdma_ia *);

int rpcrdma_ep_disconnect(struct rpcrdma_ep *, struct rpcrdma_ia *);