c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix hierarchy misspellings

Browse Source 
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reported-by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Richard Laager <rlaager@wiktel.com>
Closes #8563
Closes #8622
This commit is contained in:
Richard Laager
2019-04-14 21:06:34 -05:00
committed by Brian Behlendorf
parent 703f791d35
commit 83472fabe5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzfs/libzfs_sendrecv.c
+5 -5
View File
@@ -2759,13 +2759,13 @@ created_before(libzfs_handle_t *hdl, avl_tree_t *avl,
}
/*
* This function reestablishes the heirarchy of encryption roots after a
* This function reestablishes the hierarchy of encryption roots after a
* recursive incremental receive has completed. This must be done after the
* second call to recv_incremental_replication() has renamed and promoted all
* sent datasets to their final locations in the dataset heriarchy.
* sent datasets to their final locations in the dataset hierarchy.
*/
static int
recv_fix_encryption_heirarchy(libzfs_handle_t *hdl, const char *destname,
recv_fix_encryption_hierarchy(libzfs_handle_t *hdl, const char *destname,
nvlist_t *stream_nv, avl_tree_t *stream_avl)
{
int err;
@@ -3406,7 +3406,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
}
if (raw && softerr == 0) {
softerr = recv_fix_encryption_heirarchy(hdl, destname,
softerr = recv_fix_encryption_hierarchy(hdl, destname,
stream_nv, stream_avl);
}
@@ -3815,7 +3815,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
/*
* The keylocation property may only be set on encryption roots,
* but this dataset might not become an encryption root until
* recv_fix_encryption_heirarchy() is called. That function
* recv_fix_encryption_hierarchy() is called. That function
* will fixup the keylocation anyway, so we temporarily unset
* the keylocation for now to avoid any errors from the receive
* ioctl.