mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sunrpc: eliminate RPC_DEBUG

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

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Jeff Layton 2014-11-17 16:58:04 -05:00 committed by Trond Myklebust
parent 10b89567db
commit f895b252d4
32 changed files with 53 additions and 56 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/sunrpc/auth.h
View file

@ -53,7 +53,7 @@ struct rpc_cred {
struct rcu_head cr_rcu; struct rcu_head cr_rcu;
struct rpc_auth * cr_auth; struct rpc_auth * cr_auth;
const struct rpc_credops *cr_ops; const struct rpc_credops *cr_ops;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
unsigned long cr_magic; /* 0x0f4aa4f0 */ unsigned long cr_magic; /* 0x0f4aa4f0 */
#endif #endif
unsigned long cr_expire; /* when to gc */ unsigned long cr_expire; /* when to gc */

9
include/linux/sunrpc/debug.h
View file

@ -14,9 +14,6 @@
/* /*
* Enable RPC debugging/profiling. * Enable RPC debugging/profiling.
*/ */
#ifdef CONFIG_SUNRPC_DEBUG
#define RPC_DEBUG
#endif
#ifdef CONFIG_TRACEPOINTS #ifdef CONFIG_TRACEPOINTS
#define RPC_TRACEPOINTS #define RPC_TRACEPOINTS
#endif #endif
@ -25,7 +22,7 @@
/* /*
* Debugging macros etc * Debugging macros etc
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
extern unsigned int rpc_debug; extern unsigned int rpc_debug;
extern unsigned int nfs_debug; extern unsigned int nfs_debug;
extern unsigned int nfsd_debug; extern unsigned int nfsd_debug;
@ -36,7 +33,7 @@ extern unsigned int nlm_debug;
#define dprintk_rcu(args...) dfprintk_rcu(FACILITY, ## args) #define dprintk_rcu(args...) dfprintk_rcu(FACILITY, ## args)
#undef ifdebug #undef ifdebug
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac)) # define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac))
# define dfprintk(fac, args...) \ # define dfprintk(fac, args...) \
@ -65,7 +62,7 @@ extern unsigned int nlm_debug;
/* /*
* Sysctl interface for RPC debugging * Sysctl interface for RPC debugging
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
void rpc_register_sysctl(void); void rpc_register_sysctl(void);
void rpc_unregister_sysctl(void); void rpc_unregister_sysctl(void);
#endif #endif

8
include/linux/sunrpc/sched.h
View file

@ -79,7 +79,7 @@ struct rpc_task {
unsigned short tk_flags; /* misc flags */ unsigned short tk_flags; /* misc flags */
unsigned short tk_timeouts; /* maj timeouts */ 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 */ unsigned short tk_pid; /* debugging aid */
#endif #endif
unsigned char tk_priority : 2,/* Task priority */ unsigned char tk_priority : 2,/* Task priority */
@ -187,7 +187,7 @@ struct rpc_wait_queue {
unsigned char nr; /* # tasks remaining for cookie */ unsigned char nr; /* # tasks remaining for cookie */
unsigned short qlen; /* total # tasks waiting in queue */ unsigned short qlen; /* total # tasks waiting in queue */
struct rpc_timer timer_list; struct rpc_timer timer_list;
#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS) #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_TRACEPOINTS)
const char * name; const char * name;
#endif #endif
}; };
@ -237,7 +237,7 @@ void rpc_free(void *);
int rpciod_up(void); int rpciod_up(void);
void rpciod_down(void); void rpciod_down(void);
int __rpc_wait_for_completion_task(struct rpc_task *task, wait_bit_action_f *); 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; struct net;
void rpc_show_tasks(struct net *); void rpc_show_tasks(struct net *);
#endif #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); 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) static inline const char * rpc_qname(const struct rpc_wait_queue *q)
{ {
return ((q && q->name) ? q->name : "unknown"); return ((q && q->name) ? q->name : "unknown");

2
include/uapi/linux/nfsd/debug.h
View file

@ -15,7 +15,7 @@
* Enable debugging for nfsd. * Enable debugging for nfsd.
* Requires RPC_DEBUG. * Requires RPC_DEBUG.
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define NFSD_DEBUG 1 # define NFSD_DEBUG 1
#endif #endif

4
net/sunrpc/auth.c
View file

@ -16,7 +16,7 @@
#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/gss_api.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif
@ -646,7 +646,7 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
cred->cr_auth = auth; cred->cr_auth = auth;
cred->cr_ops = ops; cred->cr_ops = ops;
cred->cr_expire = jiffies; cred->cr_expire = jiffies;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
cred->cr_magic = RPCAUTH_CRED_MAGIC; cred->cr_magic = RPCAUTH_CRED_MAGIC;
#endif #endif
cred->cr_uid = acred->uid; cred->cr_uid = acred->uid;

2
net/sunrpc/auth_generic.c
View file

@ -14,7 +14,7 @@
#include <linux/sunrpc/debug.h> #include <linux/sunrpc/debug.h>
#include <linux/sunrpc/sched.h> #include <linux/sunrpc/sched.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/auth_gss.c
View file

@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;
#define GSS_KEY_EXPIRE_TIMEO 240 #define GSS_KEY_EXPIRE_TIMEO 240
static unsigned int gss_key_expire_timeo = GSS_KEY_EXPIRE_TIMEO; static unsigned int gss_key_expire_timeo = GSS_KEY_EXPIRE_TIMEO;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_generic_token.c
View file

@ -38,7 +38,7 @@
#include <linux/sunrpc/gss_asn1.h> #include <linux/sunrpc/gss_asn1.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_crypto.c
View file

@ -45,7 +45,7 @@
#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/gss_krb5.h>
#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/xdr.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_keys.c
View file

@ -61,7 +61,7 @@
#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/xdr.h>
#include <linux/lcm.h> #include <linux/lcm.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_mech.c
View file

@ -45,7 +45,7 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/sunrpc/gss_krb5_enctypes.h> #include <linux/sunrpc/gss_krb5_enctypes.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_seal.c
View file

@ -64,7 +64,7 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_seqnum.c
View file

@ -35,7 +35,7 @@
#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/gss_krb5.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_unseal.c
View file

@ -62,7 +62,7 @@
#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/gss_krb5.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_krb5_wrap.c
View file

@ -35,7 +35,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_mech_switch.c
View file

@ -46,7 +46,7 @@
#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/gss_api.h>
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/gss_rpc_xdr.h
View file

@ -25,7 +25,7 @@
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/xprtsock.h> #include <linux/sunrpc/xprtsock.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/auth_gss/svcauth_gss.c
View file

@ -51,7 +51,7 @@
#include "gss_rpc_upcall.h" #include "gss_rpc_upcall.h"
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

4
net/sunrpc/auth_null.c
View file

@ -10,7 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/clnt.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif
@ -138,7 +138,7 @@ struct rpc_cred null_cred = {
.cr_ops = &null_credops, .cr_ops = &null_credops,
.cr_count = ATOMIC_INIT(1), .cr_count = ATOMIC_INIT(1),
.cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE,
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
.cr_magic = RPCAUTH_CRED_MAGIC, .cr_magic = RPCAUTH_CRED_MAGIC,
#endif #endif
}; };

2
net/sunrpc/auth_unix.c
View file

@ -25,7 +25,7 @@ struct unx_cred {
#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) #define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2))
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_AUTH # define RPCDBG_FACILITY RPCDBG_AUTH
#endif #endif

2
net/sunrpc/backchannel_rqst.c
View file

@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <linux/export.h> #include <linux/export.h>
#include <linux/sunrpc/bc_xprt.h> #include <linux/sunrpc/bc_xprt.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
#define RPCDBG_FACILITY RPCDBG_TRANS #define RPCDBG_FACILITY RPCDBG_TRANS
#endif #endif

6
net/sunrpc/clnt.c
View file

@ -42,7 +42,7 @@
#include "sunrpc.h" #include "sunrpc.h"
#include "netns.h" #include "netns.h"
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_CALL # define RPCDBG_FACILITY RPCDBG_CALL
#endif #endif
@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task)
} }
EXPORT_SYMBOL_GPL(rpc_restart_call); EXPORT_SYMBOL_GPL(rpc_restart_call);
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static const char *rpc_proc_name(const struct rpc_task *task) static const char *rpc_proc_name(const struct rpc_task *task)
{ {
const struct rpc_procinfo *proc = task->tk_msg.rpc_proc; const struct rpc_procinfo *proc = task->tk_msg.rpc_proc;
@ -2421,7 +2421,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int
} }
EXPORT_SYMBOL_GPL(rpc_call_null); EXPORT_SYMBOL_GPL(rpc_call_null);
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static void rpc_show_header(void) static void rpc_show_header(void)
{ {
printk(KERN_INFO "-pid- flgs status -client- --rqstp- " printk(KERN_INFO "-pid- flgs status -client- --rqstp- "

2
net/sunrpc/rpcb_clnt.c
View file

@ -32,7 +32,7 @@
#include "netns.h" #include "netns.h"
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_BIND # define RPCDBG_FACILITY RPCDBG_BIND
#endif #endif

4
net/sunrpc/sched.c
View file

@ -24,7 +24,7 @@
#include "sunrpc.h" #include "sunrpc.h"
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
#define RPCDBG_FACILITY RPCDBG_SCHED #define RPCDBG_FACILITY RPCDBG_SCHED
#endif #endif
@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
return 0; return 0;
} }
#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS) #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) || defined(RPC_TRACEPOINTS)
static void rpc_task_set_debuginfo(struct rpc_task *task) static void rpc_task_set_debuginfo(struct rpc_task *task)
{ {
static atomic_t rpc_pid; static atomic_t rpc_pid;

4
net/sunrpc/sunrpc_syms.c
View file

@ -97,7 +97,7 @@ init_sunrpc(void)
err = register_rpc_pipefs(); err = register_rpc_pipefs();
if (err) if (err)
goto out4; goto out4;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
rpc_register_sysctl(); rpc_register_sysctl();
#endif #endif
svc_init_xprt_sock(); /* svc sock transport */ svc_init_xprt_sock(); /* svc sock transport */
@ -123,7 +123,7 @@ cleanup_sunrpc(void)
unregister_rpc_pipefs(); unregister_rpc_pipefs();
rpc_destroy_mempool(); rpc_destroy_mempool();
unregister_pernet_subsys(&sunrpc_net_ops); unregister_pernet_subsys(&sunrpc_net_ops);
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
rpc_unregister_sysctl(); rpc_unregister_sysctl();
#endif #endif
rcu_barrier(); /* Wait for completion of call_rcu()'s */ rcu_barrier(); /* Wait for completion of call_rcu()'s */

2
net/sunrpc/svc.c
View file

@ -1042,7 +1042,7 @@ static void svc_unregister(const struct svc_serv *serv, struct net *net)
/* /*
* dprintk the given error with the address of the client that caused it. * dprintk the given error with the address of the client that caused it.
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static __printf(2, 3) static __printf(2, 3)
void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...)
{ {

2
net/sunrpc/sysctl.c
View file

@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);
unsigned int nlm_debug; unsigned int nlm_debug;
EXPORT_SYMBOL_GPL(nlm_debug); EXPORT_SYMBOL_GPL(nlm_debug);
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static struct ctl_table_header *sunrpc_table_header; static struct ctl_table_header *sunrpc_table_header;
static struct ctl_table sunrpc_table[]; static struct ctl_table sunrpc_table[];

2
net/sunrpc/xprt.c
View file

@ -57,7 +57,7 @@
* Local variables * Local variables
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_XPRT # define RPCDBG_FACILITY RPCDBG_XPRT
#endif #endif

4
net/sunrpc/xprtrdma/rpc_rdma.c
View file

@ -49,11 +49,11 @@
#include <linux/highmem.h> #include <linux/highmem.h>
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_TRANS # define RPCDBG_FACILITY RPCDBG_TRANS
#endif #endif
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static const char transfertypes[][12] = { static const char transfertypes[][12] = {
"pure inline", /* no chunks */ "pure inline", /* no chunks */
" read chunk", /* some argument via rdma read */ " read chunk", /* some argument via rdma read */

8
net/sunrpc/xprtrdma/transport.c
View file

@ -55,7 +55,7 @@
#include "xprt_rdma.h" #include "xprt_rdma.h"
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_TRANS # define RPCDBG_FACILITY RPCDBG_TRANS
#endif #endif
@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;
static unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRMR; static unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRMR;
int xprt_rdma_pad_optimize = 0; int xprt_rdma_pad_optimize = 0;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static unsigned int min_slot_table_size = RPCRDMA_MIN_SLOT_TABLE; static unsigned int min_slot_table_size = RPCRDMA_MIN_SLOT_TABLE;
static unsigned int max_slot_table_size = RPCRDMA_MAX_SLOT_TABLE; static unsigned int max_slot_table_size = RPCRDMA_MAX_SLOT_TABLE;
@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)
int rc; int rc;
dprintk("RPCRDMA Module Removed, deregister RPC RDMA transport\n"); dprintk("RPCRDMA Module Removed, deregister RPC RDMA transport\n");
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
if (sunrpc_table_header) { if (sunrpc_table_header) {
unregister_sysctl_table(sunrpc_table_header); unregister_sysctl_table(sunrpc_table_header);
sunrpc_table_header = NULL; sunrpc_table_header = NULL;
@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)
dprintk("\tPadding %d\n\tMemreg %d\n", dprintk("\tPadding %d\n\tMemreg %d\n",
xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy);
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
if (!sunrpc_table_header) if (!sunrpc_table_header)
sunrpc_table_header = register_sysctl_table(sunrpc_table); sunrpc_table_header = register_sysctl_table(sunrpc_table);
#endif #endif

8
net/sunrpc/xprtrdma/verbs.c
View file

@ -57,7 +57,7 @@
* Globals/Macros * Globals/Macros
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# define RPCDBG_FACILITY RPCDBG_TRANS # define RPCDBG_FACILITY RPCDBG_TRANS
#endif #endif
@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)
rpcrdma_sendcq_upcall(ep->rep_attr.send_cq, ep); rpcrdma_sendcq_upcall(ep->rep_attr.send_cq, ep);
} }
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static const char * const conn[] = { static const char * const conn[] = {
"address resolved", "address resolved",
"address error", "address error",
@ -344,7 +344,7 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
struct rpcrdma_xprt *xprt = id->context; struct rpcrdma_xprt *xprt = id->context;
struct rpcrdma_ia *ia = &xprt->rx_ia; struct rpcrdma_ia *ia = &xprt->rx_ia;
struct rpcrdma_ep *ep = &xprt->rx_ep; struct rpcrdma_ep *ep = &xprt->rx_ep;
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
struct sockaddr_in *addr = (struct sockaddr_in *) &ep->rep_remote_addr; struct sockaddr_in *addr = (struct sockaddr_in *) &ep->rep_remote_addr;
#endif #endif
struct ib_qp_attr attr; struct ib_qp_attr attr;
@ -408,7 +408,7 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
break; break;
} }
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
if (connstate == 1) { if (connstate == 1) {
int ird = attr.max_dest_rd_atomic; int ird = attr.max_dest_rd_atomic;
int tird = ep->rep_remote_cma.responder_resources; int tird = ep->rep_remote_cma.responder_resources;

8
net/sunrpc/xprtsock.c
View file

@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;
* someone else's file names! * someone else's file names!
*/ */
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static unsigned int min_slot_table_size = RPC_MIN_SLOT_TABLE; static unsigned int min_slot_table_size = RPC_MIN_SLOT_TABLE;
static unsigned int max_slot_table_size = RPC_MAX_SLOT_TABLE; static unsigned int max_slot_table_size = RPC_MAX_SLOT_TABLE;
@ -186,7 +186,7 @@ static struct ctl_table sunrpc_table[] = {
*/ */
#define XS_IDLE_DISC_TO (5U * 60 * HZ) #define XS_IDLE_DISC_TO (5U * 60 * HZ)
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
# undef RPC_DEBUG_DATA # undef RPC_DEBUG_DATA
# define RPCDBG_FACILITY RPCDBG_TRANS # define RPCDBG_FACILITY RPCDBG_TRANS
#endif #endif
@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {
*/ */
int init_socket_xprt(void) int init_socket_xprt(void)
{ {
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
if (!sunrpc_table_header) if (!sunrpc_table_header)
sunrpc_table_header = register_sysctl_table(sunrpc_table); sunrpc_table_header = register_sysctl_table(sunrpc_table);
#endif #endif
@ -3010,7 +3010,7 @@ int init_socket_xprt(void)
*/ */
void cleanup_socket_xprt(void) void cleanup_socket_xprt(void)
{ {
#ifdef RPC_DEBUG #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
if (sunrpc_table_header) { if (sunrpc_table_header) {
unregister_sysctl_table(sunrpc_table_header); unregister_sysctl_table(sunrpc_table_header);
sunrpc_table_header = NULL; sunrpc_table_header = NULL;