Commit 1306729b authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

sunrpc: eliminate RPC_TRACEPOINTS 



It's always set to the same value as CONFIG_TRACEPOINTS, so we can just
use that instead.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f895b252

include/linux/sunrpc/debug.h

+0 −9
Original line number Diff line number Diff line
@@ -10,15 +10,6 @@ 


#include <uapi/linux/sunrpc/debug.h>





/*

 * Enable RPC debugging/profiling.

 */

#ifdef CONFIG_TRACEPOINTS

#define RPC_TRACEPOINTS

#endif

/* #define  RPC_PROFILE */



/*

 * Debugging macros etc

 */

include/linux/sunrpc/sched.h

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct rpc_task { 
	unsigned short		tk_flags;	/* misc flags */

	unsigned short		tk_timeouts;	/* maj timeouts */



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_TRACEPOINTS)

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS)

	unsigned short		tk_pid;		/* debugging aid */

#endif

	unsigned char		tk_priority : 2,/* Task priority */
@@ -187,7 +187,7 @@ struct rpc_wait_queue { 
	unsigned char		nr;			/* # tasks remaining for cookie */

	unsigned short		qlen;			/* total # tasks waiting in queue */

	struct rpc_timer	timer_list;

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_TRACEPOINTS)

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS)

	const char *		name;

#endif

};
@@ -251,7 +251,7 @@ static inline int rpc_wait_for_completion_task(struct rpc_task *task) 
	return __rpc_wait_for_completion_task(task, NULL);

}



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined (RPC_TRACEPOINTS)

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS)

static inline const char * rpc_qname(const struct rpc_wait_queue *q)

{

	return ((q && q->name) ? q->name : "unknown");

net/sunrpc/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key) 
	return 0;

}



#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_TRACEPOINTS)

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || IS_ENABLED(CONFIG_TRACEPOINTS)

static void rpc_task_set_debuginfo(struct rpc_task *task)

{

	static atomic_t rpc_pid;