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

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

xprtrdma: Rename rpcrdma_conn_upcall 



Clean up: Use a function name that is consistent with the RDMA core
API and with other consumers. Because this is a function that is
invoked from outside the rpcrdma.ko module, add an appropriate
documenting comment.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 8440a886

include/trace/events/rpcrdma.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ DECLARE_EVENT_CLASS(xprtrdma_cb_event, 
 ** Connection events

 **/



TRACE_EVENT(xprtrdma_conn_upcall,

TRACE_EVENT(xprtrdma_cm_event,

	TP_PROTO(

		const struct rpcrdma_xprt *r_xprt,

		struct rdma_cm_event *event

net/sunrpc/xprtrdma/verbs.c

+13 −3
Original line number Diff line number Diff line
@@ -219,15 +219,25 @@ rpcrdma_update_connect_private(struct rpcrdma_xprt *r_xprt, 
	rpcrdma_set_max_header_sizes(r_xprt);

}



/**

 * rpcrdma_cm_event_handler - Handle RDMA CM events

 * @id: rdma_cm_id on which an event has occurred

 * @event: details of the event

 *

 * Called with @id's mutex held. Returns 1 if caller should

 * destroy @id, otherwise 0.

 */

static int

rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)

rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)

{

	struct rpcrdma_xprt *xprt = id->context;

	struct rpcrdma_ia *ia = &xprt->rx_ia;

	struct rpcrdma_ep *ep = &xprt->rx_ep;

	int connstate = 0;



	trace_xprtrdma_conn_upcall(xprt, event);

	might_sleep();



	trace_xprtrdma_cm_event(xprt, event);

	switch (event->event) {

	case RDMA_CM_EVENT_ADDR_RESOLVED:

	case RDMA_CM_EVENT_ROUTE_RESOLVED:
@@ -308,7 +318,7 @@ rpcrdma_create_id(struct rpcrdma_xprt *xprt, struct rpcrdma_ia *ia) 
	init_completion(&ia->ri_done);

	init_completion(&ia->ri_remove_done);



	id = rdma_create_id(xprt->rx_xprt.xprt_net, rpcrdma_conn_upcall,

	id = rdma_create_id(xprt->rx_xprt.xprt_net, rpcrdma_cm_event_handler,

			    xprt, RDMA_PS_TCP, IB_QPT_RC);

	if (IS_ERR(id)) {

		rc = PTR_ERR(id);