diff options
| author | Jeff Layton | 2014-11-17 22:58:03 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2014-11-24 23:24:08 +0100 |
| commit | 10b89567db51e143c2f0828839332502916d012d (patch) | |
| tree | 817da733fbc9c253e3503e23e3deb5893b564903 | |
| parent | nfs41: fix nfs4_proc_layoutget error handling (diff) | |
| download | kernel-qcow2-linux-10b89567db51e143c2f0828839332502916d012d.tar.gz kernel-qcow2-linux-10b89567db51e143c2f0828839332502916d012d.tar.xz kernel-qcow2-linux-10b89567db51e143c2f0828839332502916d012d.zip | |
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>
| -rw-r--r-- | fs/lockd/svclock.c | 2 | ||||
| -rw-r--r-- | include/linux/lockd/debug.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 13db95f54176..56598742dde4 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -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) { /* diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index 257d3779f2ab..0ca8109934e4 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h @@ -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) |