Commit 20eb0cf9 authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)

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

parents e4236f97 a351b1f4
...@@ -884,9 +884,10 @@ EXPORT_SYMBOL (posix_acl_to_xattr); ...@@ -884,9 +884,10 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
* Return: On success, the size of the stored uapi posix acls, on error a * Return: On success, the size of the stored uapi posix acls, on error a
* negative errno. * negative errno.
*/ */
ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns, static ssize_t vfs_posix_acl_to_xattr(struct user_namespace *mnt_userns,
struct inode *inode, const struct posix_acl *acl, struct inode *inode,
void *buffer, size_t size) const struct posix_acl *acl, void *buffer,
size_t size)
{ {
struct posix_acl_xattr_header *ext_acl = buffer; struct posix_acl_xattr_header *ext_acl = buffer;
......
...@@ -35,9 +35,6 @@ posix_acl_xattr_count(size_t size) ...@@ -35,9 +35,6 @@ posix_acl_xattr_count(size_t size)
#ifdef CONFIG_FS_POSIX_ACL #ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *posix_acl_from_xattr(struct user_namespace *user_ns, struct posix_acl *posix_acl_from_xattr(struct user_namespace *user_ns,
const void *value, size_t size); 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 #else
static inline struct posix_acl * static inline struct posix_acl *
posix_acl_from_xattr(struct user_namespace *user_ns, const void *value, 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, ...@@ -45,13 +42,6 @@ posix_acl_from_xattr(struct user_namespace *user_ns, const void *value,
{ {
return ERR_PTR(-EOPNOTSUPP); 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 #endif
int posix_acl_to_xattr(struct user_namespace *user_ns, int posix_acl_to_xattr(struct user_namespace *user_ns,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment