From 0bd5fdb811b0449fcef948a100099cc3197f1b73 Mon Sep 17 00:00:00 2001

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

Date: Wed, 22 Sep 2021 18:28:36 +0300

Subject: [Backport 0bd5fdb811b0] src: Refactor ntfs_get_acl_ex for better

 readability

We can safely move set_cached_acl because it works with NULL acl too.

Reviewed-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

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

 1 file changed, 6 insertions(+), 3 deletions(-)

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

index 5c7c5c7a5ec1607cbe37c5cc6a847fd04a0d0464..3795943efc8e36d64710d8467ce48ef72c2121cd 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -518,12 +518,15 @@ static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,

 	/* Translate extended attribute to acl. */

 	if (err >= 0) {

 		acl = posix_acl_from_xattr(mnt_userns, buf, err);

-		if (!IS_ERR(acl))

-			set_cached_acl(inode, type, acl);

+	} else if (err == -ENODATA) {

+		acl = NULL;

 	} else {

-		acl = err == -ENODATA ? NULL : ERR_PTR(err);

+		acl = ERR_PTR(err);

 	}

+	if (!IS_ERR(acl))

+		set_cached_acl(inode, type, acl);

+

 	__putname(buf);

 	return acl;

-- 

2.31.1