mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-13 13:03:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fs.acl.rework' into for-next

Browse Source
This commit is contained in:
Christian Brauner
2022-10-28 10:29:15 +02:00
committed by Christian Brauner (Microsoft)
parent e4236f9768 a351b1f444
commit 20eb0cf9a3
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/posix_acl.c
View File

@@ -884,9 +884,10 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
* Return: On success, the size of the stored uapi posix acls, on error a
* negative errno.
*/
ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns,
struct inode *inode, const struct posix_acl *acl,
void *buffer, size_t size)
static ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns,
struct inode *inode,
const struct posix_acl *acl, void *buffer,
size_t size)
{
struct posix_acl_xattr_header *ext_acl = buffer;

10
include/linux/posix_acl_xattr.h
View File

@@ -35,9 +35,6 @@ posix_acl_xattr_count(size_t size)
#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *posix_acl_from_xattr(struct user_namespace *user_ns,
const void *value, size_t size);
ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns,
struct inode *inode, const struct posix_acl *acl,
void *buffer, size_t size);
#else
static inline struct posix_acl *
posix_acl_from_xattr(struct user_namespace *user_ns, const void *value,
@@ -45,13 +42,6 @@ posix_acl_from_xattr(struct user_namespace *user_ns, const void *value,
{
return ERR_PTR(-EOPNOTSUPP);
}
static inline ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns,
struct inode *inode,
const struct posix_acl *acl,
void *buffer, size_t size)
{
return 0;
}
#endif
int posix_acl_to_xattr(struct user_namespace *user_ns,