nfsd: eliminate NFSD_DEBUG (135dd002) · Commits · 戴 / test

Commit ("sunrpc: eliminate RPC_DEBUG") introduced use of IS_ENABLED() in a uapi header which leads to a build failure for userspace apps trying to use <linux/nfsd/debug.h>: linux/nfsd/debug.h:18:15: error: missing binary operator before token "(" #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) ^ Since this was only used to define NFSD_DEBUG if CONFIG_SUNRPC_DEBUG is enabled, replace instances of NFSD_DEBUG with CONFIG_SUNRPC_DEBUG. Cc: stable@vger.kernel.org Fixes: "sunrpc: eliminate RPC_DEBUG" Signed-off-by:

Mark Salter <msalter@redhat.com> Reviewed-by:

Jeff Layton <jlayton@primarydata.com> Signed-off-by:

J. Bruce Fields <bfields@redhat.com>

fs/lockd/svcsubs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		static struct hlist_head nlm_files[FILE_NRHASH];
		static DEFINE_MUTEX(nlm_file_mutex);

		#ifdef NFSD_DEBUG
		#ifdef CONFIG_SUNRPC_DEBUG
		static inline void nlm_debug_print_fh(char msg, struct nfs_fh f)
		{
		u32 fhp = (u32)f->data;

fs/nfsd/nfs4state.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1139,7 +1139,7 @@ hash_sessionid(struct nfs4_sessionid *sessionid)
		return sid->sequence % SESSION_HASH_SIZE;
		}

		#ifdef NFSD_DEBUG
		#ifdef CONFIG_SUNRPC_DEBUG
		static inline void
		dump_sessionid(const char fn, struct nfs4_sessionid sessionid)
		{

fs/nfsd/nfsd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include "export.h"

		#undef ifdebug
		#ifdef NFSD_DEBUG
		#ifdef CONFIG_SUNRPC_DEBUG
		# define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag)
		#else
		# define ifdebug(flag) if (0)

include/uapi/linux/nfsd/debug.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -11,14 +11,6 @@

		#include <linux/sunrpc/debug.h>

		/*
		* Enable debugging for nfsd.
		* Requires RPC_DEBUG.
		*/
		#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
		# define NFSD_DEBUG 1
		#endif

		/*
		* knfsd debug flags
		*/

Admin message