From 6217656da33c0920cb9f213742fd51dd215bc455 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 13 May 2021 10:00:17 -0700 Subject: Revert "Fix raw sends on encrypted datasets when copying back snapshots" Commit d1d4769 takes into account the encryption key version to decide if the local_mac could be zeroed out. However, this could lead to failure mounting encrypted datasets created with intermediate versions of ZFS encryption available in master between major releases. In order to prevent this situation revert d1d4769 pending a more comprehensive fix which addresses the mount failure case. Reviewed-by: George Amanakis Signed-off-by: Brian Behlendorf Issue #11294 Issue #12025 Issue #12300 Closes #12033 --- tests/runfiles/common.run | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/runfiles/common.run') diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index f2757f118..f681768c8 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -884,8 +884,7 @@ tests = [ 'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos', 'userquota_007_pos', 'userquota_008_pos', 'userquota_009_pos', 'userquota_010_pos', 'userquota_011_pos', 'userquota_012_neg', - 'userspace_001_pos', 'userspace_002_pos', 'userspace_encrypted', - 'userspace_send_encrypted'] + 'userspace_001_pos', 'userspace_002_pos', 'userspace_encrypted'] tags = ['functional', 'userquota'] [tests/functional/vdev_zaps] -- cgit v1.2.3