From: Jeff Layton <jeff.layton@primarydata.com>
To: Mark Salter <msalter@redhat.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-api@vger.kernel.org
Subject: Re: [PATCH] sunrpc: eliminate RPC_DEBUG
Date: Mon, 6 Apr 2015 10:04:52 -0400 [thread overview]
Message-ID: <20150406100452.402754a6@tlielax.poochiereds.net> (raw)
In-Reply-To: <1428327960-22213-1-git-send-email-msalter@redhat.com>
nit: title should probably be "sunrpc: eliminate NFSD_DEBUG"
On Mon, 6 Apr 2015 09:46:00 -0400
Mark Salter <msalter@redhat.com> wrote:
> 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.
>
> Signed-off-by: Mark Salter <msalter@redhat.com>
> ---
> 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(-)
>
> diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
> index 665ef5a..a563ddb 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
Technically, you should use #if IS_ENABLED(CONFIG_SUNRPC_DEBUG). That's
supposed to help the compiler do checking of the code inside the block
even when it's not defined.
In some cases though, that doesn't work correctly and you may need to
use plain-old #ifdef if not (particularly if there are symbols that
don't exist and are referenced inside the block when
CONFIG_SUNRPC_DEBUG isn't defined).
The CodingStyle document has a little blurb on this, fwiw...
> static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f)
> {
> u32 *fhp = (u32*)f->data;
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 26e9baa..d42786e 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -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)
> {
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 565c4da..cf98052 100644
> --- 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)
> diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h
> index 0bf130a..28ec6c9 100644
> --- 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
Looks fine other than the two nits above...
Acked-by: Jeff Layton <jeff.layton@primarydata.com>
next prev parent reply other threads:[~2015-04-06 14:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-06 13:46 Mark Salter
2015-04-06 14:04 ` Jeff Layton [this message]
2015-04-06 14:13 ` Mark Salter
2015-04-06 14:38 ` Arnd Bergmann
2015-04-06 14:45 ` Jeff Layton
2015-04-06 18:18 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150406100452.402754a6@tlielax.poochiereds.net \
--to=jeff.layton@primarydata.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=msalter@redhat.com \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®