From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org, linux-integrity@vger.kernel.org
Subject: [PATCH RFC 2/4] NFS: Rename security xattr handler
Date: Thu, 14 Feb 2019 15:43:16 -0500 [thread overview]
Message-ID: <20190214204316.6469.41405.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20190214203336.6469.34750.stgit@manet.1015granger.net>
Refactor: In a moment, the handler will no longer deal with only
NFSv4 security labels. Give it a more generic name.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfs/nfs4proc.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 557a5d6..df0ee42 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7128,20 +7128,19 @@ static bool nfs4_xattr_list_nfs4_acl(struct dentry *dentry)
#ifdef CONFIG_NFS_V4_SECURITY_LABEL
-static int nfs4_xattr_set_nfs4_label(const struct xattr_handler *handler,
- struct dentry *unused, struct inode *inode,
- const char *key, const void *buf,
- size_t buflen, int flags)
+static int nfs4_xattr_set_security(const struct xattr_handler *handler,
+ struct dentry *unused, struct inode *inode,
+ const char *key, const void *buf,
+ size_t buflen, int flags)
{
if (security_ismaclabel(key))
return nfs4_set_security_label(inode, buf, buflen);
-
return -EOPNOTSUPP;
}
-static int nfs4_xattr_get_nfs4_label(const struct xattr_handler *handler,
- struct dentry *unused, struct inode *inode,
- const char *key, void *buf, size_t buflen)
+static int nfs4_xattr_get_security(const struct xattr_handler *handler,
+ struct dentry *unused, struct inode *inode,
+ const char *key, void *buf, size_t buflen)
{
if (security_ismaclabel(key))
return nfs4_get_security_label(inode, buf, buflen);
@@ -7161,10 +7160,10 @@ static int nfs4_xattr_get_nfs4_label(const struct xattr_handler *handler,
return len;
}
-static const struct xattr_handler nfs4_xattr_nfs4_label_handler = {
+static const struct xattr_handler nfs4_xattr_security_handler = {
.prefix = XATTR_SECURITY_PREFIX,
- .get = nfs4_xattr_get_nfs4_label,
- .set = nfs4_xattr_set_nfs4_label,
+ .get = nfs4_xattr_get_security,
+ .set = nfs4_xattr_set_security,
};
#else
@@ -9824,7 +9823,7 @@ static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size)
const struct xattr_handler *nfs4_xattr_handlers[] = {
&nfs4_xattr_nfs4_acl_handler,
#ifdef CONFIG_NFS_V4_SECURITY_LABEL
- &nfs4_xattr_nfs4_label_handler,
+ &nfs4_xattr_security_handler,
#endif
NULL
};
next prev parent reply other threads:[~2019-02-14 20:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 20:43 [PATCH RFC 0/4] IMA on NFS prototype Chuck Lever
2019-02-14 20:43 ` [PATCH RFC 1/4] NFS: Define common IMA-related protocol elements Chuck Lever
2019-02-14 20:43 ` Chuck Lever [this message]
2019-02-14 20:43 ` [PATCH RFC 3/4] NFS: Prototype support for IMA on NFS (client) Chuck Lever
2019-02-14 20:43 ` [PATCH RFC 4/4] NFSD: Prototype support for IMA on NFS (server) Chuck Lever
2019-02-18 19:32 ` J. Bruce Fields
2019-02-18 19:41 ` Chuck Lever
2019-03-01 15:04 ` Bruce Fields
2019-03-01 16:01 ` Chuck Lever
2019-03-01 16:10 ` Bruce Fields
2019-02-20 0:36 ` [PATCH RFC 0/4] IMA on NFS prototype Mimi Zohar
2019-02-20 3:51 ` Chuck Lever
2019-02-20 12:26 ` Mimi Zohar
2019-02-21 14:49 ` Chuck Lever
2019-02-21 15:51 ` Mimi Zohar
2019-02-21 15:58 ` Chuck Lever
2019-02-22 20:16 ` 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=20190214204316.6469.41405.stgit@manet.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).