nfsd: eliminate NFSD_DEBUG
authorMark Salter <msalter@redhat.com>
Mon, 6 Apr 2015 13:46:00 +0000 (09:46 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 21 Apr 2015 20:16:02 +0000 (16:16 -0400)
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>
fs/lockd/svcsubs.c
fs/nfsd/nfs4state.c
fs/nfsd/nfsd.h
include/uapi/linux/nfsd/debug.h

Simple merge
Simple merge
diff --cc fs/nfsd/nfsd.h
Simple merge
Simple merge