forked from luck/tmp_suning_uos_patched
nfsd: eliminate NFSD_DEBUG
Commitf895b252d4
("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:f895b252d4
"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>
This commit is contained in:
parent
6e4891dc28
commit
135dd002c2
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user