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

sunrpc: eliminate RPC_DEBUG 



It's always set to whatever CONFIG_SUNRPC_DEBUG is, so just use that.

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

include/linux/sunrpc/auth.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct rpc_cred { 
	struct rcu_head		cr_rcu;

	struct rpc_auth *	cr_auth;

	const struct rpc_credops *cr_ops;

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

	unsigned long		cr_magic;	/* 0x0f4aa4f0 */

#endif

	unsigned long		cr_expire;	/* when to gc */

include/linux/sunrpc/debug.h

+3 −6
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
/*

 * Enable RPC debugging/profiling.

 */

#ifdef CONFIG_SUNRPC_DEBUG

#define  RPC_DEBUG

#endif

#ifdef CONFIG_TRACEPOINTS

#define RPC_TRACEPOINTS

#endif
@@ -25,7 +22,7 @@ 
/*

 * Debugging macros etc

 */

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

extern unsigned int		rpc_debug;

extern unsigned int		nfs_debug;

extern unsigned int		nfsd_debug;
@@ -36,7 +33,7 @@ extern unsigned int nlm_debug; 
#define dprintk_rcu(args...)	dfprintk_rcu(FACILITY, ## args)



#undef ifdebug

#ifdef RPC_DEBUG			

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define ifdebug(fac)		if (unlikely(rpc_debug & RPCDBG_##fac))



# define dfprintk(fac, args...)	\
@@ -65,7 +62,7 @@ extern unsigned int nlm_debug; 
/*

 * Sysctl interface for RPC debugging

 */

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

void		rpc_register_sysctl(void);

void		rpc_unregister_sysctl(void);

#endif

include/linux/sunrpc/sched.h

+4 −4
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 defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_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 defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)

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

	const char *		name;

#endif

};
@@ -237,7 +237,7 @@ void rpc_free(void *); 
int		rpciod_up(void);

void		rpciod_down(void);

int		__rpc_wait_for_completion_task(struct rpc_task *task, wait_bit_action_f *);

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

struct net;

void		rpc_show_tasks(struct net *);

#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 defined(RPC_DEBUG) || defined (RPC_TRACEPOINTS)

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

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

{

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

include/uapi/linux/nfsd/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * Enable debugging for nfsd.

 * Requires RPC_DEBUG.

 */

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define NFSD_DEBUG		1

#endif

net/sunrpc/auth.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/sunrpc/gss_api.h>

#include <linux/spinlock.h>



#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

# define RPCDBG_FACILITY	RPCDBG_AUTH

#endif
@@ -646,7 +646,7 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred, 
	cred->cr_auth = auth;

	cred->cr_ops = ops;

	cred->cr_expire = jiffies;

#ifdef RPC_DEBUG

#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)

	cred->cr_magic = RPCAUTH_CRED_MAGIC;

#endif

	cred->cr_uid = acred->uid;