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

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

xprtrdma: Remove rpcrdma_ep::rep_func and ::rep_xprt 



Clean up: The rep_func field always refers to rpcrdma_conn_func().
rep_func should have been removed by commit b45ccfd2 ("xprtrdma:
Remove MEMWINDOWS registration modes").

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

net/sunrpc/xprtrdma/rpc_rdma.c

+3 −1
Original line number Diff line number Diff line
@@ -695,7 +695,9 @@ rpcrdma_connect_worker(struct work_struct *work) 
{

	struct rpcrdma_ep *ep =

		container_of(work, struct rpcrdma_ep, rep_connect_worker.work);

	struct rpc_xprt *xprt = ep->rep_xprt;

	struct rpcrdma_xprt *r_xprt =

		container_of(ep, struct rpcrdma_xprt, rx_ep);

	struct rpc_xprt *xprt = &r_xprt->rx_xprt;



	spin_lock_bh(&xprt->transport_lock);

	if (++xprt->connect_cookie == 0)	/* maintain a reserved value */

net/sunrpc/xprtrdma/transport.c

+0 −2
Original line number Diff line number Diff line
@@ -376,8 +376,6 @@ xprt_setup_rdma(struct xprt_create *args) 
	 */

	INIT_DELAYED_WORK(&new_xprt->rx_connect_worker,

			  xprt_rdma_connect_worker);

	new_ep->rep_func = rpcrdma_conn_func;

	new_ep->rep_xprt = xprt;



	xprt_rdma_format_addresses(xprt);

	xprt->max_payload = rpcrdma_max_payload(new_xprt);

net/sunrpc/xprtrdma/verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ rpcrdma_qp_async_error_upcall(struct ib_event *event, void *context) 
		event->device->name, context);

	if (ep->rep_connected == 1) {

		ep->rep_connected = -EIO;

		ep->rep_func(ep);

		rpcrdma_conn_func(ep);

		wake_up_all(&ep->rep_connect_wait);

	}

}
@@ -169,7 +169,7 @@ rpcrdma_cq_async_error_upcall(struct ib_event *event, void *context) 
		event->device->name, context);

	if (ep->rep_connected == 1) {

		ep->rep_connected = -EIO;

		ep->rep_func(ep);

		rpcrdma_conn_func(ep);

		wake_up_all(&ep->rep_connect_wait);

	}

}
@@ -474,7 +474,7 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event) 
		dprintk("RPC:       %s: %sconnected\n",

					__func__, connstate > 0 ? "" : "dis");

		ep->rep_connected = connstate;

		ep->rep_func(ep);

		rpcrdma_conn_func(ep);

		wake_up_all(&ep->rep_connect_wait);

		/*FALLTHROUGH*/

	default:

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −2
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ struct rpcrdma_ep { 
	wait_queue_head_t 	rep_connect_wait;

	struct ib_sge		rep_pad;	/* holds zeroed pad */

	struct ib_mr		*rep_pad_mr;	/* holds zeroed pad */

	void			(*rep_func)(struct rpcrdma_ep *);

	struct rpc_xprt		*rep_xprt;	/* for rep_func */

	struct rdma_conn_param	rep_remote_cma;

	struct sockaddr_storage	rep_remote_addr;

	struct delayed_work	rep_connect_worker;