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 <[email protected]> Reviewed-by: Alek Pinchuk <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes ZOL # 6847 Closes ZOL # 6848
openzfsonosx · Jan 10, 2018 · 4bf474b · 4bf474b
1 parent 1ebb02c
commit 4bf474b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/usr/src/uts/common/fs/zfs/dsl_crypt.c b/usr/src/uts/common/fs/zfs/dsl_crypt.c
@@ -1448,7 +1448,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) {