diff options
| author | Tomohiro Kusumi <[email protected]> | 2019-07-16 08:26:52 +0900 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-07-15 16:26:52 -0700 |
| commit | 6993e012025c68e4ce0657f84fb47fe96c436735 (patch) | |
| tree | df33b9f0148622e26018918cc2c399a98f67ad53 /module | |
| parent | 64f3d39ae429e56db5e3b40ab7a5fdffd6b8a5ff (diff) | |
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 <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Tomohiro Kusumi <[email protected]>
Closes #9009
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/zpl_xattr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 8ee6e9a97..95523f28e 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -1130,12 +1130,9 @@ zpl_init_acl(struct inode *ip, struct inode *dir) return (0); if (!S_ISLNK(ip->i_mode)) { - if (ITOZSB(ip)->z_acl_type == ZFS_ACLTYPE_POSIXACL) { - acl = zpl_get_acl(dir, ACL_TYPE_DEFAULT); - if (IS_ERR(acl)) - return (PTR_ERR(acl)); - } - + acl = zpl_get_acl(dir, ACL_TYPE_DEFAULT); + if (IS_ERR(acl)) + return (PTR_ERR(acl)); if (!acl) { ip->i_mode &= ~current_umask(); 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; if (S_ISDIR(ip->i_mode)) { |