Re: [PATCH 1/2] nfsd: correctly define v4.2 support attributes

["J. Bruce Fields" <bfields@fieldses.org>]

On Sat, Nov 08, 2014 at 01:11:03PM +0100, Christoph Hellwig wrote:
> Even when security labels are disabled we support at least the same
> attributes as v4.1.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/nfsd/nfsd.h | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 747f3b95..43b6a36 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -335,12 +335,15 @@ void		nfsd_lockd_shutdown(void);
>  	(NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)
>  
>  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
> -#define NFSD4_2_SUPPORTED_ATTRS_WORD2 \
> -	(NFSD4_1_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SECURITY_LABEL)
> +#define NFSD4_2_SECURITY_ATTRS		FATTR4_WORD2_SECURITY_LABEL
>  #else
> -#define NFSD4_2_SUPPORTED_ATTRS_WORD2 0
> +#define NFSD4_2_SECURITY_ATTRS		9

I'm assuming that 9 was meant to be a 0.

--b.

>  #endif
>  
> +#define NFSD4_2_SUPPORTED_ATTRS_WORD2 \
> +	(NFSD4_1_SUPPORTED_ATTRS_WORD2 | \
> +	NFSD4_2_SECURITY_ATTRS)
> +
>  static inline u32 nfsd_suppattrs0(u32 minorversion)
>  {
>  	return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
> -- 
> 1.9.1
>