Commit e969c92c authored by David Howells's avatar David Howells
Browse files

rxrpc: Remove the [_k]net() debugging macros 



Remove the _net() and knet() debugging macros in favour of tracepoints.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent 2ebdb26e

net/rxrpc/ar-internal.h

+0 −10
Original line number Diff line number Diff line
@@ -1190,20 +1190,17 @@ extern unsigned int rxrpc_debug; 
#define kenter(FMT,...)	dbgprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define kleave(FMT,...)	dbgprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define kdebug(FMT,...)	dbgprintk("    "FMT ,##__VA_ARGS__)

#define knet(FMT,...)	dbgprintk("@@@ "FMT ,##__VA_ARGS__)





#if defined(__KDEBUG)

#define _enter(FMT,...)	kenter(FMT,##__VA_ARGS__)

#define _leave(FMT,...)	kleave(FMT,##__VA_ARGS__)

#define _debug(FMT,...)	kdebug(FMT,##__VA_ARGS__)

#define _net(FMT,...)	knet(FMT,##__VA_ARGS__)



#elif defined(CONFIG_AF_RXRPC_DEBUG)

#define RXRPC_DEBUG_KENTER	0x01

#define RXRPC_DEBUG_KLEAVE	0x02

#define RXRPC_DEBUG_KDEBUG	0x04

#define RXRPC_DEBUG_KNET	0x10



#define _enter(FMT,...)					\

do {							\
@@ -1223,17 +1220,10 @@ do { \ 
		kdebug(FMT,##__VA_ARGS__);		\

} while (0)



#define _net(FMT,...)					\

do {							\

	if (unlikely(rxrpc_debug & RXRPC_DEBUG_KNET))	\

		knet(FMT,##__VA_ARGS__);		\

} while (0)



#else

#define _enter(FMT,...)	no_printk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define _leave(FMT,...)	no_printk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define _debug(FMT,...)	no_printk("    "FMT ,##__VA_ARGS__)

#define _net(FMT,...)	no_printk("@@@ "FMT ,##__VA_ARGS__)

#endif



/*

net/rxrpc/call_object.c

+0 −6
Original line number Diff line number Diff line
@@ -349,8 +349,6 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, 


	rxrpc_start_call_timer(call);



	_net("CALL new %d on CONN %d", call->debug_id, call->conn->debug_id);



	_leave(" = %p [new]", call);

	return call;
@@ -423,8 +421,6 @@ void rxrpc_incoming_call(struct rxrpc_sock *rx, 
	hlist_add_head_rcu(&call->error_link, &conn->params.peer->error_targets);

	spin_unlock(&conn->params.peer->lock);



	_net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id);



	rxrpc_start_call_timer(call);

	_leave("");

}
@@ -669,8 +665,6 @@ void rxrpc_cleanup_call(struct rxrpc_call *call) 
{

	struct rxrpc_txbuf *txb;



	_net("DESTROY CALL %d", call->debug_id);



	memset(&call->sock_node, 0xcd, sizeof(call->sock_node));



	ASSERTCMP(call->state, ==, RXRPC_CALL_COMPLETE);

net/rxrpc/conn_client.c

+0 −2
Original line number Diff line number Diff line
@@ -541,8 +541,6 @@ static void rxrpc_activate_one_channel(struct rxrpc_connection *conn, 
	call->service_id = conn->service_id;



	trace_rxrpc_connect_call(call);

	_net("CONNECT call %08x:%08x as call %d on conn %d",

	     call->cid, call->call_id, call->debug_id, conn->debug_id);



	write_lock_bh(&call->state_lock);

	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;

net/rxrpc/conn_object.c

+0 −2
Original line number Diff line number Diff line
@@ -356,8 +356,6 @@ static void rxrpc_destroy_connection(struct rcu_head *rcu) 


	ASSERTCMP(refcount_read(&conn->ref), ==, 0);



	_net("DESTROY CONN %d", conn->debug_id);



	del_timer_sync(&conn->timer);

	rxrpc_purge_queue(&conn->rx_queue);

net/rxrpc/conn_service.c

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ void rxrpc_new_incoming_connection(struct rxrpc_sock *rx, 


	/* Make the connection a target for incoming packets. */

	rxrpc_publish_service_conn(conn->params.peer, conn);



	_net("CONNECTION new %d {%x}", conn->debug_id, conn->proto.cid);

}



/*