Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753113AbbDFONx (ORCPT ); Mon, 6 Apr 2015 10:13:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46659 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbbDFONw (ORCPT ); Mon, 6 Apr 2015 10:13:52 -0400 Message-ID: <1428329628.2973.21.camel@deneb.redhat.com> Subject: Re: [PATCH] sunrpc: eliminate RPC_DEBUG From: Mark Salter To: Jeff Layton Cc: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Date: Mon, 06 Apr 2015 10:13:48 -0400 In-Reply-To: <20150406100452.402754a6@tlielax.poochiereds.net> References: <1428327960-22213-1-git-send-email-msalter@redhat.com> <20150406100452.402754a6@tlielax.poochiereds.net> Organization: Red Hat, Inc Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3687 Lines: 111 On Mon, 2015-04-06 at 10:04 -0400, Jeff Layton wrote: > nit: title should probably be "sunrpc: eliminate NFSD_DEBUG" *sigh* Yes, of course. That is what I intended but not what I wrote. > > On Mon, 6 Apr 2015 09:46:00 -0400 > Mark Salter 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: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 > > --- > > 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 > > > > /* > > - * 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/