Re: userspace breakage in linux/nfsd/debug.h

From: Jeff Layton
Date: Thu Apr 02 2015 - 11:58:23 EST


On Thu, 02 Apr 2015 10:42:46 -0400
Mark Salter <msalter@xxxxxxxxxx> wrote:

> This patch:
>
> commit f895b252d4edf66b2895fb5a7b17a638665f3e1f
> Author: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
> 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 <jlayton@xxxxxxxxxxxxxxx>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
>
> 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 <jeff.layton@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/