tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <jlayton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Jeff Layton and committed by
Trond Myklebust 10b89567 4bd5a980

+2 -6
+1 -1
fs/lockd/svclock.c
··· 53 53 static LIST_HEAD(nlm_blocked); 54 54 static DEFINE_SPINLOCK(nlm_blocked_lock); 55 55 56 - #ifdef LOCKD_DEBUG 56 + #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 57 57 static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie) 58 58 { 59 59 /*
+1 -5
include/linux/lockd/debug.h
··· 17 17 * Enable lockd debugging. 18 18 * Requires RPC_DEBUG. 19 19 */ 20 - #ifdef RPC_DEBUG 21 - # define LOCKD_DEBUG 1 22 - #endif 23 - 24 20 #undef ifdebug 25 - #if defined(RPC_DEBUG) && defined(LOCKD_DEBUG) 21 + #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) 26 22 # define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag)) 27 23 #else 28 24 # define ifdebug(flag) if (0)