Commit f67939e4 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Replace dprintk() call site in xs_data_ready 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 0701214c

include/trace/events/sunrpc.h

+20 −0
Original line number Original line Diff line number Diff line
@@ -1266,6 +1266,26 @@ TRACE_EVENT(xprt_reserve, 
	)

	)

);

);





TRACE_EVENT(xs_data_ready,

	TP_PROTO(

		const struct rpc_xprt *xprt

	),



	TP_ARGS(xprt),



	TP_STRUCT__entry(

		__string(addr, xprt->address_strings[RPC_DISPLAY_ADDR])

		__string(port, xprt->address_strings[RPC_DISPLAY_PORT])

	),



	TP_fast_assign(

		__assign_str(addr, xprt->address_strings[RPC_DISPLAY_ADDR]);

		__assign_str(port, xprt->address_strings[RPC_DISPLAY_PORT]);

	),



	TP_printk("peer=[%s]:%s", __get_str(addr), __get_str(port))

);



TRACE_EVENT(xs_stream_read_data,

TRACE_EVENT(xs_stream_read_data,

	TP_PROTO(struct rpc_xprt *xprt, ssize_t err, size_t total),

	TP_PROTO(struct rpc_xprt *xprt, ssize_t err, size_t total),

net/sunrpc/xprtsock.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1378,7 +1378,7 @@ static void xs_udp_data_receive_workfn(struct work_struct *work) 
}

}





/**

/**

 * xs_data_ready - "data ready" callback for UDP sockets

 * xs_data_ready - "data ready" callback for sockets

 * @sk: socket with data to read

 * @sk: socket with data to read

 *

 *

 */

 */
@@ -1386,11 +1386,13 @@ static void xs_data_ready(struct sock *sk) 
{

{

	struct rpc_xprt *xprt;

	struct rpc_xprt *xprt;





	dprintk("RPC:       xs_data_ready...\n");

	xprt = xprt_from_sock(sk);

	xprt = xprt_from_sock(sk);

	if (xprt != NULL) {

	if (xprt != NULL) {

		struct sock_xprt *transport = container_of(xprt,

		struct sock_xprt *transport = container_of(xprt,

				struct sock_xprt, xprt);

				struct sock_xprt, xprt);



		trace_xs_data_ready(xprt);



		transport->old_data_ready(sk);

		transport->old_data_ready(sk);

		/* Any data means we had a useful conversation, so

		/* Any data means we had a useful conversation, so

		 * then we don't need to delay the next reconnect

		 * then we don't need to delay the next reconnect