]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fs/ntfs3: Refactor ntfs_get_acl_ex for better readability
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Wed, 22 Sep 2021 15:28:36 +0000 (18:28 +0300)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Fri, 24 Sep 2021 14:39:57 +0000 (17:39 +0300)
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>
fs/ntfs3/xattr.c

index 5c7c5c7a5ec1607cbe37c5cc6a847fd04a0d0464..3795943efc8e36d64710d8467ce48ef72c2121cd 100644 (file)
@@ -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;