From: Christoph Hellwig <hch@lst.de>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>,
linux-nfs@vger.kernel.org
Subject: [PATCH 1/2] nfsd: correctly define v4.2 support attributes
Date: Sat, 8 Nov 2014 13:11:03 +0100 [thread overview]
Message-ID: <1415448664-25815-2-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1415448664-25815-1-git-send-email-hch@lst.de>
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
#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
next prev parent reply other threads:[~2014-11-08 12:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-08 12:11 nfsd: add support for the chage_attr_type attribute Christoph Hellwig
2014-11-08 12:11 ` Christoph Hellwig [this message]
2014-11-10 22:21 ` [PATCH 1/2] nfsd: correctly define v4.2 support attributes J. Bruce Fields
2014-11-11 10:22 ` Christoph Hellwig
2014-11-08 12:11 ` [PATCH 2/2] nfsd: implement chage_attr_type attribute Christoph Hellwig
2014-11-10 17:54 ` J. Bruce Fields
2014-11-11 10:27 ` Christoph Hellwig
2014-11-11 12:36 ` Trond Myklebust
2014-11-11 16:27 ` Christoph Hellwig
2014-11-11 22:27 ` Dave Chinner
2014-11-12 10:24 ` Christoph Hellwig
2014-11-12 14:26 ` Trond Myklebust
2014-11-13 0:28 ` Dave Chinner
2014-11-13 13:02 ` Trond Myklebust
2014-11-13 21:47 ` Dave Chinner
2014-11-13 23:54 ` Dave Chinner
2014-11-14 0:43 ` Trond Myklebust
2014-11-14 4:35 ` Dave Chinner
2014-11-14 14:22 ` Trond Myklebust
2014-11-15 1:24 ` Dave Chinner
2014-11-11 21:42 ` J. Bruce Fields
2014-12-01 19:50 ` J. Bruce Fields
2014-12-02 17:23 ` Christoph Hellwig
2014-11-10 21:42 ` nfsd: add support for the " J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415448664-25815-2-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox