]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
nfsd: eliminate NFSD_DEBUG
authorMark Salter <msalter@redhat.com>
Mon, 6 Apr 2015 13:46:00 +0000 (09:46 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:02:03 +0000 (22:02 +0200)
commit465460c3372b36390b9a884f9d54427fb0ded391
tree1befaff7756ff7ef202c3c8d431fd7427d6f2012
parentb3d6135d6b83abca927ded331d252a2d59c25901
nfsd: eliminate NFSD_DEBUG

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
fs/nfsd/nfs4state.c
fs/nfsd/nfsd.h
include/uapi/linux/nfsd/debug.h