Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Drop redundant POSIX ACL check in zpl_init_acl() 

ZFS_ACLTYPE_POSIXACL has already been tested in zpl_init_acl(),
so no need to test again on POSIX ACL access.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Closes #9009
This commit is contained in:
Tomohiro Kusumi 2019-07-16 08:26:52 +09:00 committed by Brian Behlendorf
parent 64f3d39ae4
commit 6993e01202
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/zfs/zpl_xattr.c
View File

@ -1130,12 +1130,9 @@ zpl_init_acl(struct inode *ip, struct inode *dir)
return (0); return (0);
if (!S_ISLNK(ip->i_mode)) { if (!S_ISLNK(ip->i_mode)) {
if (ITOZSB(ip)->z_acl_type == ZFS_ACLTYPE_POSIXACL) { acl = zpl_get_acl(dir, ACL_TYPE_DEFAULT);
acl = zpl_get_acl(dir, ACL_TYPE_DEFAULT); if (IS_ERR(acl))
if (IS_ERR(acl)) return (PTR_ERR(acl));
return (PTR_ERR(acl));
}
if (!acl) { if (!acl) {
ip->i_mode &= ~current_umask(); ip->i_mode &= ~current_umask();
ip->i_ctime = current_time(ip); ip->i_ctime = current_time(ip);
@ -1144,7 +1141,7 @@ zpl_init_acl(struct inode *ip, struct inode *dir)
} }
} }
if ((ITOZSB(ip)->z_acl_type == ZFS_ACLTYPE_POSIXACL) && acl) { if (acl) {
umode_t mode; umode_t mode;
if (S_ISDIR(ip->i_mode)) { if (S_ISDIR(ip->i_mode)) {