From dcad058eb83bb7f4214df200e7e7a31c50544df5 Mon Sep 17 00:00:00 2001 From: Konstantin Komarov Date: Fri, 28 Jan 2022 16:30:07 +0800 Subject: [PATCH] fs/ntfs3: Refactor ntfs_get_acl_ex for better readability mainline inclusion from mainline-v5.15 commit 0bd5fdb811b0449fcef948a100099cc3197f1b73 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4G67J?from=project-issue CVE: NA ---------------------------------------------------------------------- We can safely move set_cached_acl because it works with NULL acl too. Reviewed-by: Kari Argillander Signed-off-by: Konstantin Komarov Signed-off-by: Yin Xiujiang Signed-off-by: Zheng Zengkai Acked-by: Hou Tao Acked-by: Xie XiuQi Signed-off-by: Zheng Zengkai --- fs/ntfs3/xattr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c index 5c7c5c7a5ec1..3795943efc8e 100644 --- a/fs/ntfs3/xattr.c +++ b/fs/ntfs3/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; -- GitLab