| From 135dd002c23054aaa056ea3162c1e0356905c195 Mon Sep 17 00:00:00 2001 |
| From: Mark Salter <msalter@redhat.com> |
| Date: Mon, 6 Apr 2015 09:46:00 -0400 |
| Subject: nfsd: eliminate NFSD_DEBUG |
| |
| From: Mark Salter <msalter@redhat.com> |
| |
| commit 135dd002c23054aaa056ea3162c1e0356905c195 upstream. |
| |
| Commit f895b252d4edf ("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. |
| |
| Fixes: f895b252d4edf "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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/lockd/svcsubs.c | 2 +- |
| fs/nfsd/nfs4state.c | 2 +- |
| fs/nfsd/nfsd.h | 2 +- |
| include/uapi/linux/nfsd/debug.h | 8 -------- |
| 4 files changed, 3 insertions(+), 11 deletions(-) |
| |
| --- a/fs/lockd/svcsubs.c |
| +++ b/fs/lockd/svcsubs.c |
| @@ -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; |
| --- a/fs/nfsd/nfs4state.c |
| +++ b/fs/nfsd/nfs4state.c |
| @@ -1139,7 +1139,7 @@ hash_sessionid(struct nfs4_sessionid *se |
| 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) |
| { |
| --- a/fs/nfsd/nfsd.h |
| +++ b/fs/nfsd/nfsd.h |
| @@ -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) |
| --- a/include/uapi/linux/nfsd/debug.h |
| +++ b/include/uapi/linux/nfsd/debug.h |
| @@ -12,14 +12,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 |
| */ |
| #define NFSDDBG_SOCK 0x0001 |