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

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

xprtrdma: Rename rpcrdma_qp_async_error_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 31e62d25

include/trace/events/rpcrdma.h

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ DEFINE_RXPRT_EVENT(xprtrdma_reinsert); 
DEFINE_RXPRT_EVENT(xprtrdma_reconnect);

DEFINE_RXPRT_EVENT(xprtrdma_inject_dsc);



TRACE_EVENT(xprtrdma_qp_error,

TRACE_EVENT(xprtrdma_qp_event,

	TP_PROTO(

		const struct rpcrdma_xprt *r_xprt,

		const struct ib_event *event

net/sunrpc/xprtrdma/verbs.c

+11 −3
Original line number Diff line number Diff line
@@ -127,14 +127,22 @@ rpcrdma_disconnect_worker(struct work_struct *work) 
	xprt_force_disconnect(&r_xprt->rx_xprt);

}



/**

 * rpcrdma_qp_event_handler - Handle one QP event (error notification)

 * @event: details of the event

 * @context: ep that owns QP where event occurred

 *

 * Called from the RDMA provider (device driver) possibly in an interrupt

 * context.

 */

static void

rpcrdma_qp_async_error_upcall(struct ib_event *event, void *context)

rpcrdma_qp_event_handler(struct ib_event *event, void *context)

{

	struct rpcrdma_ep *ep = context;

	struct rpcrdma_xprt *r_xprt = container_of(ep, struct rpcrdma_xprt,

						   rx_ep);



	trace_xprtrdma_qp_error(r_xprt, event);

	trace_xprtrdma_qp_event(r_xprt, event);

	pr_err("rpcrdma: %s on device %s ep %p\n",

	       ib_event_msg(event->event), event->device->name, context);
@@ -547,7 +555,7 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
	if (rc)

		return rc;



	ep->rep_attr.event_handler = rpcrdma_qp_async_error_upcall;

	ep->rep_attr.event_handler = rpcrdma_qp_event_handler;

	ep->rep_attr.qp_context = ep;

	ep->rep_attr.srq = NULL;

	ep->rep_attr.cap.max_send_sge = max_sge;