folkslinux
/
zfs
mirror of https://github.com/openzfs/zfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <behlendorf1@llnl.gov>
Reviewed-by: Alek Pinchuk <apinchuk@datto.com>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #6847 
Closes #6848
This commit is contained in:
Tom Caputi 2017-11-08 18:25:30 -05:00 committed by Brian Behlendorf
parent 71a24c3c52
commit 62df1bc813
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/dsl_crypt.c
View File

@ -1454,7 +1454,8 @@ spa_keystore_change_key_sync(void *arg, dmu_tx_t *tx)
0, 0, NULL, tx); 0, 0, NULL, tx);
rddobj = ds->ds_dir->dd_object; 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) { if (wkey == NULL) {