On Wed, Sep 22, 2021 at 07:20:05PM +0300, Konstantin Komarov wrote:
> Right now ntfs3 uses posix_acl_equiv_mode instead of
> posix_acl_update_mode like all other fs.
>
> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Kari Argillander <kari.argillander@xxxxxxxxx>
> ---
> fs/ntfs3/xattr.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
> index 70f2f9eb6b1e..59ec5e61a239 100644
> --- a/fs/ntfs3/xattr.c
> +++ b/fs/ntfs3/xattr.c
> @@ -559,22 +559,15 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
> if (acl) {
> umode_t mode = inode->i_mode;
>
> - err = posix_acl_equiv_mode(acl, &mode);
> - if (err < 0)
> - return err;
> + err = posix_acl_update_mode(mnt_userns, inode, &mode,
> + &acl);
> + if (err)
> + goto out;
>
> if (inode->i_mode != mode) {
> inode->i_mode = mode;
> 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_len = sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1;
> --
> 2.33.0
>
>
>
