| From 6d0ba0432a5e10bc714ba9c5adc460e726e5fbb4 Mon Sep 17 00:00:00 2001 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Sat, 8 Nov 2014 13:11:03 +0100 |
| Subject: nfsd: correctly define v4.2 support attributes |
| |
| From: Christoph Hellwig <hch@lst.de> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfsd/nfsd.h | 9 ++++++--- |
| 1 file changed, 6 insertions(+), 3 deletions(-) |
| |
| --- a/fs/nfsd/nfsd.h |
| +++ b/fs/nfsd/nfsd.h |
| @@ -328,12 +328,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 |
