diff --git a/module/os/linux/zfs/zfs_acl.c b/module/os/linux/zfs/zfs_acl.c index 1c496680740f..61978d22419e 100644 --- a/module/os/linux/zfs/zfs_acl.c +++ b/module/os/linux/zfs/zfs_acl.c @@ -2608,13 +2608,8 @@ zfs_zaccess_common(znode_t *zp, uint32_t v4_mode, uint32_t *working_mode, return (SET_ERROR(EPERM)); } - /* - * Workaround for POSIX ACL type to avoid deadlock - */ - if ((zp->z_pflags & ZFS_ACL_TRIVIAL) && - zfsvfs->z_acl_type != ZFS_ACLTYPE_POSIX) { + if (zp->z_pflags & ZFS_ACL_TRIVIAL) return (zfs_zaccess_trivial(zp, working_mode, cr)); - } return (zfs_zaccess_aces_check(zp, working_mode, B_FALSE, cr)); }