Commit 10b89567 authored Nov 17, 2014 by Jeff Layton Committed by Trond Myklebust Nov 24, 2014

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>

parent 4bd5a980

fs/lockd/svclock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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)