From ba77237ef880320105e681b93d596b2fb13860f9 Mon Sep 17 00:00:00 2001

From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

Date: Wed, 22 Sep 2021 18:46:14 +0300

Subject: [Backport ba77237ef880] src: 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>

---

 src/xattr.c | 15 ++++-----------

 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/xattr.c b/src/xattr.c

index 70f2f9eb6b1eb3e7bebc3703762abfb7e42d7be1..59ec5e61a2390511a633c39b4e8ae3b01a2b9840 100644

--- a/src/xattr.c

+++ b/src/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.31.1