From 62df1bc813e6972130fffa91c6999a8e5ef80afd Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Wed, 8 Nov 2017 18:25:30 -0500 Subject: [PATCH] Fix encryption root hierarchy issue After doing a recursive raw receive, zfs userspace performs a final pass to adjust the encryption root hierarchy as needed. Unfortunately, the FORCE_INHERIT ioctl had a bug which caused the encryption root to always be assigned to the direct parent instead of the inheriting parent. This patch simply fixes this issue. Reviewed-by: Brian Behlendorf Reviewed-by: Alek Pinchuk Signed-off-by: Tom Caputi Closes #6847 Closes #6848 --- module/zfs/dsl_crypt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/zfs/dsl_crypt.c b/module/zfs/dsl_crypt.c index a71142682718..59562d194e73 100644 --- a/module/zfs/dsl_crypt.c +++ b/module/zfs/dsl_crypt.c @@ -1454,7 +1454,8 @@ spa_keystore_change_key_sync(void *arg, dmu_tx_t *tx) 0, 0, NULL, tx); rddobj = ds->ds_dir->dd_object; - new_rddobj = ds->ds_dir->dd_parent->dd_object; + VERIFY0(dsl_dir_get_encryption_root_ddobj(ds->ds_dir->dd_parent, + &new_rddobj)); } if (wkey == NULL) {