From da68988708d6e38457ce965103d001e8aa965885 Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Thu, 20 Jun 2019 15:29:51 -0400 Subject: Allow unencrypted children of encrypted datasets When encryption was first added to ZFS, we made a decision to prevent users from creating unencrypted children of encrypted datasets. The idea was to prevent users from inadvertently leaving some of their data unencrypted. However, since the release of 0.8.0, some legitimate reasons have been brought up for this behavior to be allowed. This patch simply removes this limitation from all code paths that had checks for it and updates the tests accordingly. Reviewed-by: Jason King Reviewed-by: Sean Eric Fagan Reviewed-by: Richard Laager Reviewed-by: Brian Behlendorf Signed-off-by: Tom Caputi Closes #8737 Closes #8870 --- include/sys/dsl_crypt.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/sys') diff --git a/include/sys/dsl_crypt.h b/include/sys/dsl_crypt.h index c2c0a548a..0f73ea6c6 100644 --- a/include/sys/dsl_crypt.h +++ b/include/sys/dsl_crypt.h @@ -209,7 +209,6 @@ void dsl_dataset_create_crypt_sync(uint64_t dsobj, dsl_dir_t *dd, struct dsl_dataset *origin, dsl_crypto_params_t *dcp, dmu_tx_t *tx); uint64_t dsl_crypto_key_create_sync(uint64_t crypt, dsl_wrapping_key_t *wkey, dmu_tx_t *tx); -int dmu_objset_clone_crypt_check(dsl_dir_t *parentdd, dsl_dir_t *origindd); uint64_t dsl_crypto_key_clone_sync(dsl_dir_t *origindd, dmu_tx_t *tx); void dsl_crypto_key_destroy_sync(uint64_t dckobj, dmu_tx_t *tx); -- cgit v1.2.3