mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 15:29:16 +00:00
fs/ntfs3: Change posix_acl_equiv_mode to posix_acl_update_mode
Right now ntfs3 uses posix_acl_equiv_mode instead of posix_acl_update_mode like all other fs. Reviewed-by: Kari Argillander <kari.argillander@gmail.com> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
parent
398c35f4d7
commit
ba77237ef8
@ -559,22 +559,15 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
|
|||||||
if (acl) {
|
if (acl) {
|
||||||
umode_t mode = inode->i_mode;
|
umode_t mode = inode->i_mode;
|
||||||
|
|
||||||
err = posix_acl_equiv_mode(acl, &mode);
|
err = posix_acl_update_mode(mnt_userns, inode, &mode,
|
||||||
if (err < 0)
|
&acl);
|
||||||
return err;
|
if (err)
|
||||||
|
goto out;
|
||||||
|
|
||||||
if (inode->i_mode != mode) {
|
if (inode->i_mode != mode) {
|
||||||
inode->i_mode = mode;
|
inode->i_mode = mode;
|
||||||
mark_inode_dirty(inode);
|
mark_inode_dirty(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!err) {
|
|
||||||
/*
|
|
||||||
* ACL can be exactly represented in the
|
|
||||||
* traditional file mode permission bits.
|
|
||||||
*/
|
|
||||||
acl = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
name = XATTR_NAME_POSIX_ACL_ACCESS;
|
name = XATTR_NAME_POSIX_ACL_ACCESS;
|
||||||
name_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1;
|
name_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user