Return-Path: Received: from mail-qg0-f49.google.com ([209.85.192.49]:33931 "EHLO mail-qg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbbDBP6R (ORCPT ); Thu, 2 Apr 2015 11:58:17 -0400 Received: by qgep97 with SMTP id p97so73105158qge.1 for ; Thu, 02 Apr 2015 08:58:16 -0700 (PDT) Date: Thu, 2 Apr 2015 11:58:13 -0400 From: Jeff Layton To: Mark Salter Cc: Jeff Layton , Trond Myklebust , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: userspace breakage in linux/nfsd/debug.h Message-ID: <20150402115813.6abf5596@tlielax.poochiereds.net> In-Reply-To: <1427985766.2973.11.camel@deneb.redhat.com> References: <1427985766.2973.11.camel@deneb.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-nfs-owner@vger.kernel.org List-ID: On Thu, 02 Apr 2015 10:42:46 -0400 Mark Salter wrote: > This patch: > > commit f895b252d4edf66b2895fb5a7b17a638665f3e1f > Author: Jeff Layton > Date: Mon Nov 17 16:58:04 2014 -0500 > > sunrpc: eliminate RPC_DEBUG > > It's always set to whatever CONFIG_SUNRPC_DEBUG is, so just use that. > > Signed-off-by: Jeff Layton > Signed-off-by: Trond Myklebust > > breaks userspace use of linux/nfsd/debug.h because of: > > diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h > index a6f453c..1fdc95b 100644 > --- a/include/uapi/linux/nfsd/debug.h > +++ b/include/uapi/linux/nfsd/debug.h > @@ -15,7 +15,7 @@ > * Enable debugging for nfsd. > * Requires RPC_DEBUG. > */ > -#ifdef RPC_DEBUG > +#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) > # define NFSD_DEBUG 1 > #endif > > IS_ENABLED() is not available outside the kernel and causes a compile > time failure: > > /usr/include/linux/nfsd/debug.h:18:15: error: missing binary operator before token "(" > #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) > > > Huh, ok. Probably the right solution is to just get rid of NFSD_DEBUG and convert all of the "#ifdef NFSD_DEBUG" statements into "#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)". Then we can just remove that whole block from nfsd/debug.h altogether. Mike, care to spin up a patch for that or shall I? -- Jeff Layton