Commit 485e71e8 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by J. Bruce Fields

posix_acl: Add set_posix_acl

Factor out part of posix_acl_xattr_set into a common function that takes
a posix_acl, which nfsd can also call.

The prototype already exists in include/linux/posix_acl.h.
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Cc: stable@vger.kernel.org
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 8c7245ab
...@@ -820,39 +820,43 @@ posix_acl_xattr_get(const struct xattr_handler *handler, ...@@ -820,39 +820,43 @@ posix_acl_xattr_get(const struct xattr_handler *handler,
return error; return error;
} }
static int int
posix_acl_xattr_set(const struct xattr_handler *handler, set_posix_acl(struct inode *inode, int type, struct posix_acl *acl)
struct dentry *unused, struct inode *inode,
const char *name, const void *value,
size_t size, int flags)
{ {
struct posix_acl *acl = NULL;
int ret;
if (!IS_POSIXACL(inode)) if (!IS_POSIXACL(inode))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!inode->i_op->set_acl) if (!inode->i_op->set_acl)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (handler->flags == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode)) if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
return value ? -EACCES : 0; return acl ? -EACCES : 0;
if (!inode_owner_or_capable(inode)) if (!inode_owner_or_capable(inode))
return -EPERM; return -EPERM;
if (acl) {
int ret = posix_acl_valid(acl);
if (ret)
return ret;
}
return inode->i_op->set_acl(inode, acl, type);
}
EXPORT_SYMBOL(set_posix_acl);
static int
posix_acl_xattr_set(const struct xattr_handler *handler,
struct dentry *unused, struct inode *inode,
const char *name, const void *value,
size_t size, int flags)
{
struct posix_acl *acl = NULL;
int ret;
if (value) { if (value) {
acl = posix_acl_from_xattr(&init_user_ns, value, size); acl = posix_acl_from_xattr(&init_user_ns, value, size);
if (IS_ERR(acl)) if (IS_ERR(acl))
return PTR_ERR(acl); return PTR_ERR(acl);
if (acl) {
ret = posix_acl_valid(acl);
if (ret)
goto out;
}
} }
ret = set_posix_acl(inode, handler->flags, acl);
ret = inode->i_op->set_acl(inode, acl, handler->flags);
out:
posix_acl_release(acl); posix_acl_release(acl);
return ret; return ret;
} }
......
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