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

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

xprtrdma: Make rpcrdma_ep_disconnect() return void 



Clean up: The return code is used only for dprintk's that are
already redundant.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Tested-by: default avatarShirley Ma <shirley.ma@oracle.com>
Tested-by: default avatarDevesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent bb96193d

net/sunrpc/xprtrdma/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ xprt_rdma_close(struct rpc_xprt *xprt) 
	if (r_xprt->rx_ep.rep_connected > 0)

		xprt->reestablish_timeout = 0;

	xprt_disconnect_done(xprt);

	(void) rpcrdma_ep_disconnect(&r_xprt->rx_ep, &r_xprt->rx_ia);

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

}



static void

net/sunrpc/xprtrdma/verbs.c

+4 −10
Original line number Diff line number Diff line
@@ -830,10 +830,7 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
	cancel_delayed_work_sync(&ep->rep_connect_worker);



	if (ia->ri_id->qp) {

		rc = rpcrdma_ep_disconnect(ep, ia);

		if (rc)

			dprintk("RPC:       %s: rpcrdma_ep_disconnect"

				" returned %i\n", __func__, rc);

		rpcrdma_ep_disconnect(ep, ia);

		rdma_destroy_qp(ia->ri_id);

		ia->ri_id->qp = NULL;

	}
@@ -871,10 +868,8 @@ rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
		struct rpcrdma_xprt *xprt;

retry:

		dprintk("RPC:       %s: reconnecting...\n", __func__);

		rc = rpcrdma_ep_disconnect(ep, ia);

		if (rc && rc != -ENOTCONN)

			dprintk("RPC:       %s: rpcrdma_ep_disconnect"

				" status %i\n", __func__, rc);



		rpcrdma_ep_disconnect(ep, ia);

		rpcrdma_flush_cqs(ep);



		if (ia->ri_memreg_strategy == RPCRDMA_FRMR)
@@ -984,7 +979,7 @@ out: 
 * This call is not reentrant, and must not be made in parallel

 * on the same endpoint.

 */

int

void

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

{

	int rc;
@@ -1001,7 +996,6 @@ rpcrdma_ep_disconnect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
		dprintk("RPC:       %s: rdma_disconnect %i\n", __func__, rc);

		ep->rep_connected = rc;

	}

	return rc;

}



static int

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ int rpcrdma_ep_create(struct rpcrdma_ep *, struct rpcrdma_ia *, 
				struct rpcrdma_create_data_internal *);

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 *);

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



int rpcrdma_ep_post(struct rpcrdma_ia *, struct rpcrdma_ep *,

				struct rpcrdma_req *);