lockd/sunrpc: eliminate some pointless macro indirection
Subsystems (3)
cover lockd/sunrpc: eliminate some pointless macro indirection
We currently have a number of legacy macros in the sunrpc code, as well as a smaller number in lockd that are used to indicate whether debugging support is compiled in or not.
This hash always seemed like pointless indirection as those symbols always reflect the value of a CONFIG_* value. This patchset just removes those macros in favor of their CONFIG_* equivalents.
Jeff Layton (3):
lockd: eliminate LOCKD_DEBUG
sunrpc: eliminate RPC_DEBUG
sunrpc: eliminate RPC_TRACEPOINTS
fs/lockd/svclock.c | 2 +- include/linux/lockd/debug.h | 6 +----- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 18 +++--------------- include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 34 files changed, 55 insertions(+), 71 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/3 lockd: eliminate LOCKD_DEBUG
LOCKD_DEBUG is always the same value as CONFIG_SUNRPC_DEBUG, so we can just use it instead.
Signed-off-by Jeff Layton <[email protected]>
--- fs/lockd/svclock.c | 2 +- include/linux/lockd/debug.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-)
fs/lockd/svclock.c +1 -1
@@ -53,7 +53,7 @@ static const struct rpc_call_ops nlmsvc_grant_ops;static LIST_HEAD (nlm_blocked);static DEFINE_SPINLOCK (nlm_blocked_lock); -#ifdef LOCKD_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *nlmdbg_cookie2a (const struct nlm_cookie *cookie) {/*
include/linux/lockd/debug.h +1 -5
@@ -17,12 +17,8 @@* Enable lockd debugging. * Requires RPC_DEBUG. */ -#ifdef RPC_DEBUG -# define LOCKD_DEBUG 1 -#endif -#undef ifdebug -#if defined(RPC_DEBUG ) && defined(LOCKD_DEBUG ) +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define ifdebug (flag) if (unlikely(nlm_debug & NLMDBG_##flag))#else # define ifdebug (flag) if (0)
Signature · 1 line
2.1.0
PATCH 2/3 sunrpc: eliminate RPC_DEBUG
In reply to Jeff LaytonIt's always set to whatever CONFIG_SUNRPC_DEBUG is, so just use that.
Signed-off-by Jeff Layton <[email protected]>
--- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 9 +++------ include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 32 files changed, 53 insertions(+), 56 deletions(-)
include/linux/sunrpc/auth.h +1 -1
@@ -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
@@ -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 );int sunrpc_debugfs_init (void );
include/linux/sunrpc/sched.h +4 -4
@@ -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
@@ -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
@@ -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;
net/sunrpc/auth_generic.c +1 -1
@@ -14,7 +14,7 @@#include <linux/sunrpc/debug.h> #include <linux/sunrpc/sched.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/auth_gss.c +1 -1
@@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;#define GSS_KEY_EXPIRE_TIMEO 240static unsigned int gss_key_expire_timeo =GSS_KEY_EXPIRE_TIMEO ; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_generic_token.c +1 -1
@@ -38,7 +38,7 @@#include <linux/sunrpc/gss_asn1.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_crypto.c +1 -1
@@ -45,7 +45,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/xdr.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_keys.c +1 -1
@@ -61,7 +61,7 @@#include <linux/sunrpc/xdr.h> #include <linux/lcm.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_mech.c +1 -1
@@ -45,7 +45,7 @@#include <linux/crypto.h> #include <linux/sunrpc/gss_krb5_enctypes.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_seal.c +1 -1
@@ -64,7 +64,7 @@#include <linux/random.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_seqnum.c +1 -1
@@ -35,7 +35,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_unseal.c +1 -1
@@ -62,7 +62,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_krb5_wrap.c +1 -1
@@ -35,7 +35,7 @@#include <linux/pagemap.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_mech_switch.c +1 -1
@@ -46,7 +46,7 @@#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/gss_rpc_xdr.h +1 -1
@@ -25,7 +25,7 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprtsock.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_gss/svcauth_gss.c +1 -1
@@ -51,7 +51,7 @@#include "gss_rpc_upcall.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/auth_null.c +2 -2
@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
@@ -138,7 +138,7 @@ struct rpc_cred null_cred = { .cr_ops = &null_credops, .cr_count = ATOMIC_INIT(1), .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) .cr_magic = RPCAUTH_CRED_MAGIC,#endif };
net/sunrpc/auth_unix.c +1 -1
@@ -25,7 +25,7 @@ struct unx_cred {#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif
net/sunrpc/backchannel_rqst.c +1 -1
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#include <linux/export.h> #include <linux/sunrpc/bc_xprt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_TRANS#endif
net/sunrpc/clnt.c +3 -3
@@ -42,7 +42,7 @@#include "sunrpc.h" #include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_CALL#endif
@@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task) }EXPORT_SYMBOL_GPL (rpc_restart_call); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )const char *rpc_proc_name (const struct rpc_task *task) {
@@ -2422,7 +2422,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int }EXPORT_SYMBOL_GPL (rpc_call_null); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static void rpc_show_header (void ) { printk(KERN_INFO "-pid- flgs status -client- --rqstp- "
net/sunrpc/rpcb_clnt.c +1 -1
@@ -32,7 +32,7 @@#include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_BIND#endif
net/sunrpc/sched.c +2 -2
@@ -24,7 +24,7 @@#include "sunrpc.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_SCHED#endif
@@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)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 atomic_t rpc_pid;
net/sunrpc/sunrpc_syms.c +2 -2
@@ -102,7 +102,7 @@ init_sunrpc(void)if (err) goto out5; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_register_sysctl ();#endif svc_init_xprt_sock ();/* svc sock transport */
@@ -131,7 +131,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif rcu_barrier ();/* Wait for completion of call_rcu()'s */
net/sunrpc/svc.c +1 -1
@@ -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. */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) static __printf(2, 3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {
net/sunrpc/sysctl.c +1 -1
@@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);unsigned int 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 sunrpc_table[];
net/sunrpc/xprt.c +1 -1
@@ -57,7 +57,7 @@* Local variables */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_XPRT#endif
net/sunrpc/xprtrdma/rpc_rdma.c +2 -2
@@ -49,11 +49,11 @@#include <linux/highmem.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char transfertypes[][12 ] = {"pure inline" ,/* no chunks */ " read chunk", /* some argument via rdma read */
net/sunrpc/xprtrdma/transport.c +4 -4
@@ -55,7 +55,7 @@#include "xprt_rdma.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif
@@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;static unsigned int xprt_rdma_memreg_strategy =RPCRDMA_FRMR ;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 max_slot_table_size =RPCRDMA_MAX_SLOT_TABLE ;
@@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)int rc;dprintk ("RPCRDMA Module Removed, deregister RPC RDMA transport\n" ); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;
@@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)dprintk ("\tPadding %d\n\tMemreg %d\n" , xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif
net/sunrpc/xprtrdma/verbs.c +4 -4
@@ -57,7 +57,7 @@* Globals/Macros */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif
@@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)rpcrdma_sendcq_upcall (ep->rep_attr.send_cq, ep); } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *const conn[] = {"address resolved" , "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_ia *ia = &xprt->rx_ia;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;#endif struct ib_qp_attr attr;
@@ -408,7 +408,7 @@ connected:break ; } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (connstate ==1 ) {int ird = attr.max_dest_rd_atomic;int tird = ep->rep_remote_cma.responder_resources;
net/sunrpc/xprtsock.c +4 -4
@@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;* 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 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) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# undef RPC_DEBUG_DATA# define RPCDBG_FACILITY RPCDBG_TRANS#endif
@@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {*/ int init_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif
@@ -3010,7 +3010,7 @@ int init_socket_xprt(void)*/ void cleanup_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;
Signature · 1 line
2.1.0
Re: [PATCH 2/3] sunrpc: eliminate RPC_DEBUG
Hi Jeff,
I'm getting a git error when I try to apply this patch:
Applying: sunrpc: eliminate RPC_DEBUG
fatal: sha1 information is lacking or useless (include/linux/sunrpc/debug.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
What am I missing?
Anna
Quoted 649 lines · Jeff Layton
It's always set to whatever
CONFIG_SUNRPC_DEBUGis, so just use that.Signed-off-by Jeff Layton <[email protected]>--- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 9 +++------ include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 32 files changed, 53 insertions(+), 56 deletions(-)include/linux/sunrpc/auth.h +1
-1@@ -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@@ -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 );int sunrpc_debugfs_init (void );include/linux/sunrpc/sched.h +4
-4@@ -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@@ -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@@ -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;net/sunrpc/auth_generic.c +1
-1@@ -14,7 +14,7 @@#include <linux/sunrpc/debug.h> #include <linux/sunrpc/sched.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;#define GSS_KEY_EXPIRE_TIMEO 240static unsigned int gss_key_expire_timeo =GSS_KEY_EXPIRE_TIMEO ; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_generic_token.c +1
-1@@ -38,7 +38,7 @@#include <linux/sunrpc/gss_asn1.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_crypto.c +1
-1@@ -45,7 +45,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/xdr.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_keys.c +1
-1@@ -61,7 +61,7 @@#include <linux/sunrpc/xdr.h> #include <linux/lcm.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_mech.c +1
-1@@ -45,7 +45,7 @@#include <linux/crypto.h> #include <linux/sunrpc/gss_krb5_enctypes.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seal.c +1
-1@@ -64,7 +64,7 @@#include <linux/random.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seqnum.c +1
-1@@ -35,7 +35,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_unseal.c +1
-1@@ -62,7 +62,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-1@@ -35,7 +35,7 @@#include <linux/pagemap.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_mech_switch.c +1
-1@@ -46,7 +46,7 @@#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_rpc_xdr.h +1
-1@@ -25,7 +25,7 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprtsock.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/svcauth_gss.c +1
-1@@ -51,7 +51,7 @@#include "gss_rpc_upcall.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_null.c +2
-2@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif @@ -138,7 +138,7 @@ struct rpc_cred null_cred = { .cr_ops = &null_credops, .cr_count = ATOMIC_INIT(1), .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) .cr_magic = RPCAUTH_CRED_MAGIC,#endif };net/sunrpc/auth_unix.c +1
-1@@ -25,7 +25,7 @@ struct unx_cred {#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/backchannel_rqst.c +1
-1@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#include <linux/export.h> #include <linux/sunrpc/bc_xprt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_TRANS#endif net/sunrpc/clnt.c +3
-3@@ -42,7 +42,7 @@#include "sunrpc.h" #include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_CALL#endif @@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task) }EXPORT_SYMBOL_GPL (rpc_restart_call); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )const char *rpc_proc_name (const struct rpc_task *task) {@@ -2422,7 +2422,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int }EXPORT_SYMBOL_GPL (rpc_call_null); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static void rpc_show_header (void ) { printk(KERN_INFO "-pid- flgs status -client- --rqstp- "net/sunrpc/rpcb_clnt.c +1
-1@@ -32,7 +32,7 @@#include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_BIND#endif net/sunrpc/sched.c +2
-2@@ -24,7 +24,7 @@#include "sunrpc.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_SCHED#endif @@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)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 atomic_t rpc_pid;net/sunrpc/sunrpc_syms.c +2
-2@@ -102,7 +102,7 @@ init_sunrpc(void)if (err) goto out5; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_register_sysctl ();#endif svc_init_xprt_sock ();/* svc sock transport */ @@ -131,7 +131,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif rcu_barrier ();/* Wait for completion of call_rcu()'s */ net/sunrpc/svc.c +1
-1@@ -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. */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) static __printf(2, 3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {net/sunrpc/sysctl.c +1
-1@@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);unsigned int 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 sunrpc_table[];net/sunrpc/xprt.c +1
-1@@ -57,7 +57,7 @@* Local variables */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_XPRT#endif net/sunrpc/xprtrdma/rpc_rdma.c +2
-2@@ -49,11 +49,11 @@#include <linux/highmem.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char transfertypes[][12 ] = {"pure inline" ,/* no chunks */ " read chunk", /* some argument via rdma read */net/sunrpc/xprtrdma/transport.c +4
-4@@ -55,7 +55,7 @@#include "xprt_rdma.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;static unsigned int xprt_rdma_memreg_strategy =RPCRDMA_FRMR ;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 max_slot_table_size =RPCRDMA_MAX_SLOT_TABLE ;@@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)int rc;dprintk ("RPCRDMA Module Removed, deregister RPC RDMA transport\n" ); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;@@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)dprintk ("\tPadding %d\n\tMemreg %d\n" , xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif net/sunrpc/xprtrdma/verbs.c +4
-4@@ -57,7 +57,7 @@* Globals/Macros */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)rpcrdma_sendcq_upcall (ep->rep_attr.send_cq, ep); } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *const conn[] = {"address resolved" , "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_ia *ia = &xprt->rx_ia;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;#endif struct ib_qp_attr attr;@@ -408,7 +408,7 @@ connected:break ; } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (connstate ==1 ) {int ird = attr.max_dest_rd_atomic;int tird = ep->rep_remote_cma.responder_resources;net/sunrpc/xprtsock.c +4
-4@@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;* 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 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) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# undef RPC_DEBUG_DATA# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {*/ int init_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif @@ -3010,7 +3010,7 @@ int init_socket_xprt(void)*/ void cleanup_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;
Re: [PATCH 2/3] sunrpc: eliminate RPC_DEBUG
Quoted 4 lines · On Tue, 18 Nov 2014 08:40:58 -0500 Anna Schumaker <[email protected]>…
Hi Jeff,
I'm getting a git error when I try to apply this patch:
Quoted 9 lines
Applying: sunrpc: eliminate
RPC_DEBUG
fatal: sha1 information is lacking or useless (include/linux/sunrpc/debug.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.What am I missing?
Anna
Oh, hmmm...
This patchset is based on top of the patches that adds the new tracepoints and the debugfs file for dumping the client's rpc_task queue that I sent on 10/28.
Are you missing those?
Quoted 652 lines · Jeff Layton
Quoted 649 lines
It's always set to whatever
CONFIG_SUNRPC_DEBUGis, so just use that.Signed-off-by Jeff Layton <[email protected]>--- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 9 +++------ include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 32 files changed, 53 insertions(+), 56 deletions(-)include/linux/sunrpc/auth.h +1
-1@@ -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@@ -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 );int sunrpc_debugfs_init (void );include/linux/sunrpc/sched.h +4
-4@@ -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@@ -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@@ -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;net/sunrpc/auth_generic.c +1
-1@@ -14,7 +14,7 @@#include <linux/sunrpc/debug.h> #include <linux/sunrpc/sched.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;#define GSS_KEY_EXPIRE_TIMEO 240static unsigned int gss_key_expire_timeo =GSS_KEY_EXPIRE_TIMEO ; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_generic_token.c +1
-1@@ -38,7 +38,7 @@#include <linux/sunrpc/gss_asn1.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_crypto.c +1
-1@@ -45,7 +45,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/xdr.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_keys.c +1
-1@@ -61,7 +61,7 @@#include <linux/sunrpc/xdr.h> #include <linux/lcm.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_mech.c +1
-1@@ -45,7 +45,7 @@#include <linux/crypto.h> #include <linux/sunrpc/gss_krb5_enctypes.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seal.c +1
-1@@ -64,7 +64,7 @@#include <linux/random.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seqnum.c +1
-1@@ -35,7 +35,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_unseal.c +1
-1@@ -62,7 +62,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-1@@ -35,7 +35,7 @@#include <linux/pagemap.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_mech_switch.c +1
-1@@ -46,7 +46,7 @@#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_rpc_xdr.h +1
-1@@ -25,7 +25,7 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprtsock.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/svcauth_gss.c +1
-1@@ -51,7 +51,7 @@#include "gss_rpc_upcall.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_null.c +2
-2@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif @@ -138,7 +138,7 @@ struct rpc_cred null_cred = { .cr_ops = &null_credops, .cr_count = ATOMIC_INIT(1), .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) .cr_magic = RPCAUTH_CRED_MAGIC,#endif };net/sunrpc/auth_unix.c +1
-1@@ -25,7 +25,7 @@ struct unx_cred {#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/backchannel_rqst.c +1
-1@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#include <linux/export.h> #include <linux/sunrpc/bc_xprt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_TRANS#endif net/sunrpc/clnt.c +3
-3@@ -42,7 +42,7 @@#include "sunrpc.h" #include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_CALL#endif @@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task) }EXPORT_SYMBOL_GPL (rpc_restart_call); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )const char *rpc_proc_name (const struct rpc_task *task) {@@ -2422,7 +2422,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int }EXPORT_SYMBOL_GPL (rpc_call_null); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static void rpc_show_header (void ) { printk(KERN_INFO "-pid- flgs status -client- --rqstp- "net/sunrpc/rpcb_clnt.c +1
-1@@ -32,7 +32,7 @@#include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_BIND#endif net/sunrpc/sched.c +2
-2@@ -24,7 +24,7 @@#include "sunrpc.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_SCHED#endif @@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)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 atomic_t rpc_pid;net/sunrpc/sunrpc_syms.c +2
-2@@ -102,7 +102,7 @@ init_sunrpc(void)if (err) goto out5; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_register_sysctl ();#endif svc_init_xprt_sock ();/* svc sock transport */ @@ -131,7 +131,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif rcu_barrier ();/* Wait for completion of call_rcu()'s */ net/sunrpc/svc.c +1
-1@@ -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. */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) static __printf(2, 3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {net/sunrpc/sysctl.c +1
-1@@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);unsigned int 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 sunrpc_table[];net/sunrpc/xprt.c +1
-1@@ -57,7 +57,7 @@* Local variables */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_XPRT#endif net/sunrpc/xprtrdma/rpc_rdma.c +2
-2@@ -49,11 +49,11 @@#include <linux/highmem.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char transfertypes[][12 ] = {"pure inline" ,/* no chunks */ " read chunk", /* some argument via rdma read */net/sunrpc/xprtrdma/transport.c +4
-4@@ -55,7 +55,7 @@#include "xprt_rdma.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;static unsigned int xprt_rdma_memreg_strategy =RPCRDMA_FRMR ;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 max_slot_table_size =RPCRDMA_MAX_SLOT_TABLE ;@@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)int rc;dprintk ("RPCRDMA Module Removed, deregister RPC RDMA transport\n" ); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;@@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)dprintk ("\tPadding %d\n\tMemreg %d\n" , xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif net/sunrpc/xprtrdma/verbs.c +4
-4@@ -57,7 +57,7 @@* Globals/Macros */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)rpcrdma_sendcq_upcall (ep->rep_attr.send_cq, ep); } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *const conn[] = {"address resolved" , "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_ia *ia = &xprt->rx_ia;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;#endif struct ib_qp_attr attr;@@ -408,7 +408,7 @@ connected:break ; } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (connstate ==1 ) {int ird = attr.max_dest_rd_atomic;int tird = ep->rep_remote_cma.responder_resources;net/sunrpc/xprtsock.c +4
-4@@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;* 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 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) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# undef RPC_DEBUG_DATA# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {*/ int init_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif @@ -3010,7 +3010,7 @@ int init_socket_xprt(void)*/ void cleanup_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;
Signature · 1 line
Jeff Layton <[email protected]>
Re: [PATCH 2/3] sunrpc: eliminate RPC_DEBUG
Quoted 17 lines · Jeff Layton
Quoted 4 lines · On Tue, 18 Nov 2014 08:40:58 -0500 Anna Schumaker <[email protected]>…
Hi Jeff,
I'm getting a git error when I try to apply this patch:
Quoted 9 lines
Applying: sunrpc: eliminate
RPC_DEBUG
fatal: sha1 information is lacking or useless (include/linux/sunrpc/debug.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.What am I missing?
Anna
Quoted 7 lines
Oh, hmmm...
This patchset is based on top of the patches that adds the new tracepoints and the debugfs file for dumping the client's
rpc_taskqueue that I sent on 10/28.Are you missing those?
I expect I am so I'll apply them and try again! Thanks!
Anna
Quoted 656 lines
Quoted 654 lines · Jeff Layton
Quoted 649 lines
It's always set to whatever
CONFIG_SUNRPC_DEBUGis, so just use that.Signed-off-by Jeff Layton <[email protected]>--- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 9 +++------ include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 32 files changed, 53 insertions(+), 56 deletions(-)include/linux/sunrpc/auth.h +1
-1@@ -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@@ -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 );int sunrpc_debugfs_init (void );include/linux/sunrpc/sched.h +4
-4@@ -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@@ -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@@ -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;net/sunrpc/auth_generic.c +1
-1@@ -14,7 +14,7 @@#include <linux/sunrpc/debug.h> #include <linux/sunrpc/sched.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;#define GSS_KEY_EXPIRE_TIMEO 240static unsigned int gss_key_expire_timeo =GSS_KEY_EXPIRE_TIMEO ; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_generic_token.c +1
-1@@ -38,7 +38,7 @@#include <linux/sunrpc/gss_asn1.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_crypto.c +1
-1@@ -45,7 +45,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/xdr.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_keys.c +1
-1@@ -61,7 +61,7 @@#include <linux/sunrpc/xdr.h> #include <linux/lcm.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_mech.c +1
-1@@ -45,7 +45,7 @@#include <linux/crypto.h> #include <linux/sunrpc/gss_krb5_enctypes.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seal.c +1
-1@@ -64,7 +64,7 @@#include <linux/random.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seqnum.c +1
-1@@ -35,7 +35,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_unseal.c +1
-1@@ -62,7 +62,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-1@@ -35,7 +35,7 @@#include <linux/pagemap.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_mech_switch.c +1
-1@@ -46,7 +46,7 @@#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_rpc_xdr.h +1
-1@@ -25,7 +25,7 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprtsock.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/svcauth_gss.c +1
-1@@ -51,7 +51,7 @@#include "gss_rpc_upcall.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_null.c +2
-2@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif @@ -138,7 +138,7 @@ struct rpc_cred null_cred = { .cr_ops = &null_credops, .cr_count = ATOMIC_INIT(1), .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) .cr_magic = RPCAUTH_CRED_MAGIC,#endif };net/sunrpc/auth_unix.c +1
-1@@ -25,7 +25,7 @@ struct unx_cred {#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/backchannel_rqst.c +1
-1@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#include <linux/export.h> #include <linux/sunrpc/bc_xprt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_TRANS#endif net/sunrpc/clnt.c +3
-3@@ -42,7 +42,7 @@#include "sunrpc.h" #include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_CALL#endif @@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task) }EXPORT_SYMBOL_GPL (rpc_restart_call); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )const char *rpc_proc_name (const struct rpc_task *task) {@@ -2422,7 +2422,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int }EXPORT_SYMBOL_GPL (rpc_call_null); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static void rpc_show_header (void ) { printk(KERN_INFO "-pid- flgs status -client- --rqstp- "net/sunrpc/rpcb_clnt.c +1
-1@@ -32,7 +32,7 @@#include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_BIND#endif net/sunrpc/sched.c +2
-2@@ -24,7 +24,7 @@#include "sunrpc.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_SCHED#endif @@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)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 atomic_t rpc_pid;net/sunrpc/sunrpc_syms.c +2
-2@@ -102,7 +102,7 @@ init_sunrpc(void)if (err) goto out5; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_register_sysctl ();#endif svc_init_xprt_sock ();/* svc sock transport */ @@ -131,7 +131,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif rcu_barrier ();/* Wait for completion of call_rcu()'s */ net/sunrpc/svc.c +1
-1@@ -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. */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) static __printf(2, 3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {net/sunrpc/sysctl.c +1
-1@@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);unsigned int 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 sunrpc_table[];net/sunrpc/xprt.c +1
-1@@ -57,7 +57,7 @@* Local variables */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_XPRT#endif net/sunrpc/xprtrdma/rpc_rdma.c +2
-2@@ -49,11 +49,11 @@#include <linux/highmem.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char transfertypes[][12 ] = {"pure inline" ,/* no chunks */ " read chunk", /* some argument via rdma read */net/sunrpc/xprtrdma/transport.c +4
-4@@ -55,7 +55,7 @@#include "xprt_rdma.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;static unsigned int xprt_rdma_memreg_strategy =RPCRDMA_FRMR ;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 max_slot_table_size =RPCRDMA_MAX_SLOT_TABLE ;@@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)int rc;dprintk ("RPCRDMA Module Removed, deregister RPC RDMA transport\n" ); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;@@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)dprintk ("\tPadding %d\n\tMemreg %d\n" , xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif net/sunrpc/xprtrdma/verbs.c +4
-4@@ -57,7 +57,7 @@* Globals/Macros */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)rpcrdma_sendcq_upcall (ep->rep_attr.send_cq, ep); } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *const conn[] = {"address resolved" , "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_ia *ia = &xprt->rx_ia;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;#endif struct ib_qp_attr attr;@@ -408,7 +408,7 @@ connected:break ; } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (connstate ==1 ) {int ird = attr.max_dest_rd_atomic;int tird = ep->rep_remote_cma.responder_resources;net/sunrpc/xprtsock.c +4
-4@@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;* 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 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) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# undef RPC_DEBUG_DATA# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {*/ int init_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif @@ -3010,7 +3010,7 @@ int init_socket_xprt(void)*/ void cleanup_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;
Re: [PATCH 2/3] sunrpc: eliminate RPC_DEBUG
Quoted 17 lines · Anna Schumaker
Quoted 16 lines · Jeff Layton
Quoted 13 lines · On Tue, 18 Nov 2014 08:40:58 -0500 Anna Schumaker <[email protected]>…
Hi Jeff,
I'm getting a git error when I try to apply this patch:
Applying: sunrpc: eliminate
RPC_DEBUG
fatal: sha1 information is lacking or useless (include/linux/sunrpc/debug.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.What am I missing?
Anna
Quoted 8 lines
Quoted 7 lines
Oh, hmmm...
This patchset is based on top of the patches that adds the new tracepoints and the debugfs file for dumping the client's
rpc_taskqueue that I sent on 10/28.Are you missing those?
I expect I am so I'll apply them and try again! Thanks!
I found the missing patches and everything applied cleanly. I like the idea of using the CONFIG_WHATEVER values directly, but I'm curious if there was a reason this code wasn't written that way from the beginning?
Anna
Quoted 659 lines
Anna
Quoted 643 lines
Quoted 643 lines · Jeff Layton
Quoted 641 lines
It's always set to whatever
CONFIG_SUNRPC_DEBUGis, so just use that.Signed-off-by Jeff Layton <[email protected]>--- include/linux/sunrpc/auth.h | 2 +- include/linux/sunrpc/debug.h | 9 +++------ include/linux/sunrpc/sched.h | 8 ++++---- include/uapi/linux/nfsd/debug.h | 2 +- net/sunrpc/auth.c | 4 ++-- net/sunrpc/auth_generic.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 2 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +- net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/auth_null.c | 4 ++-- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/backchannel_rqst.c | 2 +- net/sunrpc/clnt.c | 6 +++--- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 4 ++-- net/sunrpc/sunrpc_syms.c | 4 ++-- net/sunrpc/svc.c | 2 +- net/sunrpc/sysctl.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++-- net/sunrpc/xprtrdma/transport.c | 8 ++++---- net/sunrpc/xprtrdma/verbs.c | 8 ++++---- net/sunrpc/xprtsock.c | 8 ++++---- 32 files changed, 53 insertions(+), 56 deletions(-)include/linux/sunrpc/auth.h +1
-1@@ -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@@ -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 );int sunrpc_debugfs_init (void );include/linux/sunrpc/sched.h +4
-4@@ -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@@ -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@@ -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;net/sunrpc/auth_generic.c +1
-1@@ -14,7 +14,7 @@#include <linux/sunrpc/debug.h> #include <linux/sunrpc/sched.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -66,7 +66,7 @@ static unsigned int gss_expired_cred_retry_delay = GSS_RETRY_EXPIRED;#define GSS_KEY_EXPIRE_TIMEO 240static unsigned int gss_key_expire_timeo =GSS_KEY_EXPIRE_TIMEO ; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_generic_token.c +1
-1@@ -38,7 +38,7 @@#include <linux/sunrpc/gss_asn1.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_crypto.c +1
-1@@ -45,7 +45,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/sunrpc/xdr.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_keys.c +1
-1@@ -61,7 +61,7 @@#include <linux/sunrpc/xdr.h> #include <linux/lcm.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_mech.c +1
-1@@ -45,7 +45,7 @@#include <linux/crypto.h> #include <linux/sunrpc/gss_krb5_enctypes.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seal.c +1
-1@@ -64,7 +64,7 @@#include <linux/random.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_seqnum.c +1
-1@@ -35,7 +35,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_unseal.c +1
-1@@ -62,7 +62,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-1@@ -35,7 +35,7 @@#include <linux/pagemap.h> #include <linux/crypto.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_mech_switch.c +1
-1@@ -46,7 +46,7 @@#include <linux/sunrpc/gss_api.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/gss_rpc_xdr.h +1
-1@@ -25,7 +25,7 @@#include <linux/sunrpc/clnt.h> #include <linux/sunrpc/xprtsock.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_gss/svcauth_gss.c +1
-1@@ -51,7 +51,7 @@#include "gss_rpc_upcall.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/auth_null.c +2
-2@@ -10,7 +10,7 @@#include <linux/module.h> #include <linux/sunrpc/clnt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif @@ -138,7 +138,7 @@ struct rpc_cred null_cred = { .cr_ops = &null_credops, .cr_count = ATOMIC_INIT(1), .cr_flags = 1UL << RPCAUTH_CRED_UPTODATE, -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) .cr_magic = RPCAUTH_CRED_MAGIC,#endif };net/sunrpc/auth_unix.c +1
-1@@ -25,7 +25,7 @@ struct unx_cred {#define UNX_WRITESLACK (21 + (UNX_MAXNODENAME >> 2)) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH#endif net/sunrpc/backchannel_rqst.c +1
-1@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#include <linux/export.h> #include <linux/sunrpc/bc_xprt.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_TRANS#endif net/sunrpc/clnt.c +3
-3@@ -42,7 +42,7 @@#include "sunrpc.h" #include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_CALL#endif @@ -1396,7 +1396,7 @@ rpc_restart_call(struct rpc_task *task) }EXPORT_SYMBOL_GPL (rpc_restart_call); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )const char *rpc_proc_name (const struct rpc_task *task) {@@ -2422,7 +2422,7 @@ struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, int }EXPORT_SYMBOL_GPL (rpc_call_null); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static void rpc_show_header (void ) { printk(KERN_INFO "-pid- flgs status -client- --rqstp- "net/sunrpc/rpcb_clnt.c +1
-1@@ -32,7 +32,7 @@#include "netns.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_BIND#endif net/sunrpc/sched.c +2
-2@@ -24,7 +24,7 @@#include "sunrpc.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )#define RPCDBG_FACILITY RPCDBG_SCHED#endif @@ -258,7 +258,7 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)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 atomic_t rpc_pid;net/sunrpc/sunrpc_syms.c +2
-2@@ -102,7 +102,7 @@ init_sunrpc(void)if (err) goto out5; -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_register_sysctl ();#endif svc_init_xprt_sock ();/* svc sock transport */ @@ -131,7 +131,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif rcu_barrier ();/* Wait for completion of call_rcu()'s */ net/sunrpc/svc.c +1
-1@@ -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. */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG ) static __printf(2, 3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {net/sunrpc/sysctl.c +1
-1@@ -37,7 +37,7 @@ EXPORT_SYMBOL_GPL(nfsd_debug);unsigned int 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 sunrpc_table[];net/sunrpc/xprt.c +1
-1@@ -57,7 +57,7 @@* Local variables */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_XPRT#endif net/sunrpc/xprtrdma/rpc_rdma.c +2
-2@@ -49,11 +49,11 @@#include <linux/highmem.h> -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char transfertypes[][12 ] = {"pure inline" ,/* no chunks */ " read chunk", /* some argument via rdma read */net/sunrpc/xprtrdma/transport.c +4
-4@@ -55,7 +55,7 @@#include "xprt_rdma.h" -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -75,7 +75,7 @@ static unsigned int xprt_rdma_inline_write_padding;static unsigned int xprt_rdma_memreg_strategy =RPCRDMA_FRMR ;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 max_slot_table_size =RPCRDMA_MAX_SLOT_TABLE ;@@ -705,7 +705,7 @@ static void __exit xprt_rdma_cleanup(void)int rc;dprintk ("RPCRDMA Module Removed, deregister RPC RDMA transport\n" ); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;@@ -736,7 +736,7 @@ static int __init xprt_rdma_init(void)dprintk ("\tPadding %d\n\tMemreg %d\n" , xprt_rdma_inline_write_padding, xprt_rdma_memreg_strategy); -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif net/sunrpc/xprtrdma/verbs.c +4
-4@@ -57,7 +57,7 @@* Globals/Macros */ -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -313,7 +313,7 @@ rpcrdma_flush_cqs(struct rpcrdma_ep *ep)rpcrdma_sendcq_upcall (ep->rep_attr.send_cq, ep); } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )static const char *const conn[] = {"address resolved" , "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_ia *ia = &xprt->rx_ia;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;#endif struct ib_qp_attr attr;@@ -408,7 +408,7 @@ connected:break ; } -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (connstate ==1 ) {int ird = attr.max_dest_rd_atomic;int tird = ep->rep_remote_cma.responder_resources;net/sunrpc/xprtsock.c +3
-3@@ -75,7 +75,7 @@ static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;* 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 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) -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# undef RPC_DEBUG_DATA# define RPCDBG_FACILITY RPCDBG_TRANS#endif @@ -2991,7 +2991,7 @@ static struct xprt_class xs_bc_tcp_transport = {*/ int init_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (!sunrpc_table_header) sunrpc_table_header =register_sysctl_table (sunrpc_table);#endif @@ -3010,7 +3010,7 @@ int init_socket_xprt(void)Quoted 9 lines
Quoted 8 lines
net/sunrpc/xprtsock.c int init_socket_xprt(void) · line 3016
Quoted 8 lines
net/sunrpc/xprtsock.c +1
-1*/ void cleanup_socket_xprt (void ) { -#ifdef RPC_DEBUG +#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )if (sunrpc_table_header) {unregister_sysctl_table (sunrpc_table_header); sunrpc_table_header =NULL ;--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/3 sunrpc: eliminate RPC_TRACEPOINTS
In reply to Jeff LaytonIt's always set to the same value as CONFIG_TRACEPOINTS, so we can just use that instead.
Signed-off-by Jeff Layton <[email protected]>
--- include/linux/sunrpc/debug.h | 9 --------- include/linux/sunrpc/sched.h | 6 +++--- net/sunrpc/sched.c | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-)
include/linux/sunrpc/debug.h +0 -9
@@ -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
@@ -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
@@ -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;
Signature · 1 line
2.1.0