Revert "Skip permission checks for POSIX ACL type"

This reverts commit 465cef1.
truenas · Dec 28, 2022 · c3029e4 · c3029e4
1 parent 739135d
commit c3029e4
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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));
 }