2022-10-27 08:36:21

by Ondrej Valousek

[permalink] [raw]
Subject: [PATCH 1/1] nfs: Move ACL xattr definitions to linux/xattr.h

Short description:
The XATTR_NAME_NFSV4_ACL definition is also useful for
userspace (i.e. nfs4_acl_tools/libacl/coreutils) so makes a sense to move the
definition to the linux/xattr.h

Signed-off-by: Ondrej Valousek <[email protected]>
---
fs/nfs/nfs4proc.c | 2 --
include/uapi/linux/xattr.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index e2efcd26336c..07c3d8572912 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7680,8 +7680,6 @@ nfs4_release_lockowner(struct nfs_server *server, struct nfs4_lock_state *lsp)
rpc_call_async(server->client, &msg, 0, &nfs4_release_lockowner_ops, data);
}

-#define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
-
static int nfs4_xattr_set_nfs4_acl(const struct xattr_handler *handler,
struct user_namespace *mnt_userns,
struct dentry *unused, struct inode *inode,
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
index 9463db2dfa9d..77eb8c885861 100644
--- a/include/uapi/linux/xattr.h
+++ b/include/uapi/linux/xattr.h
@@ -81,5 +81,7 @@
#define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT

+#define XATTR_NFSV4_ACL "nfs4_acl"
+#define XATTR_NAME_NFSV4_ACL XATTR_SYSTEM_PREFIX XATTR_NFSV4_ACL

#endif /* _UAPI_LINUX_XATTR_H */
--
2.37.3