]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Revert "Fix raw sends on encrypted datasets when copying back snapshots"
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 13 May 2021 17:00:17 +0000 (10:00 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2021 05:10:13 +0000 (22:10 -0700)
commitfaa5673982a5d9768c5b0f8ba76c38ad9c6d01e8
tree70dccd79cc6aa423b88494ad1aecb90068c94213
parentade8e4b7d6a4d46933c9aeb562af3aaca022690b
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 <gamanakis@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #11294
Issue #12025
Issue #12300
Closes #12033
module/os/freebsd/zfs/zio_crypt.c
module/os/linux/zfs/zio_crypt.c
module/zfs/dsl_crypt.c
tests/runfiles/common.run
tests/zfs-tests/tests/functional/userquota/Makefile.am
tests/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh [deleted file]