Commit 6d0ba043 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: correctly define v4.2 support attributes 



Even when security labels are disabled we support at least the same
attributes as v4.1.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: stable@kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fc14f9c1

fs/nfsd/nfsd.h

+6 −3
Original line number Diff line number Diff line
@@ -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		0

#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