diff options
author | Mark Salter <msalter@redhat.com> | 2015-04-06 09:46:00 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2015-04-21 16:16:02 -0400 |
commit | 135dd002c23054aaa056ea3162c1e0356905c195 (patch) | |
tree | c4c0a14d73625b4920132008c1f8fbd3980678d5 /fs/lockd | |
parent | 6e4891dc289cd191d46ab7ba1dcb29646644f9ca (diff) | |
download | linux-stable-135dd002c23054aaa056ea3162c1e0356905c195.tar.gz linux-stable-135dd002c23054aaa056ea3162c1e0356905c195.tar.bz2 linux-stable-135dd002c23054aaa056ea3162c1e0356905c195.zip |
nfsd: eliminate NFSD_DEBUG
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.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/svcsubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index 665ef5a05183..a563ddbc19e6 100644 --- 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; |