Re: [PATCH] nfs: replace uses of __constant_{endian}

["NeilBrown" <neilb@suse.de>]

On Thu, February 12, 2009 12:16 pm, Harvey Harrison wrote:
> The base versions handle constant folding now, none of these headers
> are exported to userspace, so the __ prefixed versions are not
> necessary.

I assume you compile tested this?

I seem to recall that the reason we did it that way was that
some of the error codes are used in switch statements, and
the value for a 'case:' really has to look like a constant, not just
happen to evaluate to one.

However if it really does work with all supported compilers
this way, then its a nice improvement, thanks.

NeilBrown


>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
>  include/linux/lockd/xdr.h  |   12 ++--
>  include/linux/lockd/xdr4.h |   10 ++--
>  include/linux/nfsd/nfsd.h  |  132
> ++++++++++++++++++++++----------------------
>  include/linux/sunrpc/xdr.h |   42 +++++++-------
>  4 files changed, 98 insertions(+), 98 deletions(-)
>
> diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
> index 7dc5b6c..d39ed1c 100644
> --- a/include/linux/lockd/xdr.h
> +++ b/include/linux/lockd/xdr.h
> @@ -25,13 +25,13 @@ struct svc_rqst;
>  #define NLM_MAXCOOKIELEN    	32
>  #define NLM_MAXSTRLEN		1024
>
> -#define	nlm_granted		__constant_htonl(NLM_LCK_GRANTED)
> -#define	nlm_lck_denied		__constant_htonl(NLM_LCK_DENIED)
> -#define	nlm_lck_denied_nolocks	__constant_htonl(NLM_LCK_DENIED_NOLOCKS)
> -#define	nlm_lck_blocked		__constant_htonl(NLM_LCK_BLOCKED)
> -#define	nlm_lck_denied_grace_period	__constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
> +#define	nlm_granted		cpu_to_be32(NLM_LCK_GRANTED)
> +#define	nlm_lck_denied		cpu_to_be32(NLM_LCK_DENIED)
> +#define	nlm_lck_denied_nolocks	cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
> +#define	nlm_lck_blocked		cpu_to_be32(NLM_LCK_BLOCKED)
> +#define	nlm_lck_denied_grace_period	cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
>
> -#define nlm_drop_reply		__constant_htonl(30000)
> +#define nlm_drop_reply		cpu_to_be32(30000)
>