diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-11-08 13:11:03 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-12-10 17:14:53 +0000 |
| commit | 723495228c44147b0814e964074e0525b4f68c70 (patch) | |
| tree | ad066371b007520e09ff88d39792c163698c1421 /fs/nfsd | |
| parent | 7198f244bdaa89807f34e08e96e30bf85775d270 (diff) | |
| download | linux-stable-723495228c44147b0814e964074e0525b4f68c70.tar.gz linux-stable-723495228c44147b0814e964074e0525b4f68c70.tar.bz2 linux-stable-723495228c44147b0814e964074e0525b4f68c70.zip | |
nfsd: correctly define v4.2 support attributes
commit 6d0ba0432a5e10bc714ba9c5adc460e726e5fbb4 upstream.
Even when security labels are disabled we support at least the same
attributes as v4.1.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsd.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 847daf37e566..1579b2171fcc 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 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 |