c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libzfs/libzfs_sendrecv.c
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 * recursive incremental receive has completed. This must be done after the
* second call to recv_incremental_replication() has renamed and promoted all * 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 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) nvlist_t *stream_nv, avl_tree_t *stream_avl)
{ {
int err; int err;
@ -3406,7 +3406,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
} }
if (raw && softerr == 0) { if (raw && softerr == 0) {
softerr = recv_fix_encryption_heirarchy(hdl, destname, softerr = recv_fix_encryption_hierarchy(hdl, destname,
stream_nv, stream_avl); 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, * The keylocation property may only be set on encryption roots,
* but this dataset might not become an encryption root until * 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 * will fixup the keylocation anyway, so we temporarily unset
* the keylocation for now to avoid any errors from the receive * the keylocation for now to avoid any errors from the receive
* ioctl. * ioctl.

2
tests/runfiles/linux.run
View File

@ -803,7 +803,7 @@ tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
'send-c_lz4_disabled', 'send-c_recv_lz4_disabled', 'send-c_lz4_disabled', 'send-c_recv_lz4_disabled',
'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD', 'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize', 'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize',
'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_heirarchy', 'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
'send_encrypted_props', 'send_freeobjects', 'send_realloc_dnode_size', 'send_encrypted_props', 'send_freeobjects', 'send_realloc_dnode_size',
'send_realloc_files', 'send_holds', 'send_hole_birth', 'send_mixed_raw', 'send_realloc_files', 'send_holds', 'send_hole_birth', 'send_mixed_raw',
'send-wDR_encrypted_zvol'] 'send-wDR_encrypted_zvol']

2
tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
View File

@ -135,7 +135,7 @@ for obj in $child_fs $child_fs1 $ctr $ctr1; do
log_mustnot zfs destroy -r $obj log_mustnot zfs destroy -r $obj
datasetexists $obj || \ datasetexists $obj || \
log_fail "'zfs destroy -r' fails to keep dependent " \ log_fail "'zfs destroy -r' fails to keep dependent " \
"clone outside the hirearchy." "clone outside the hierarchy."
done done

2
tests/zfs-tests/tests/functional/rsend/Makefile.am
View File

@ -22,7 +22,7 @@ dist_pkgdata_SCRIPTS = \
rsend_022_pos.ksh \ rsend_022_pos.ksh \
rsend_024_pos.ksh \ rsend_024_pos.ksh \
send_encrypted_files.ksh \ send_encrypted_files.ksh \
send_encrypted_heirarchy.ksh \ send_encrypted_hierarchy.ksh \
send_encrypted_props.ksh \ send_encrypted_props.ksh \
send-cD.ksh \ send-cD.ksh \
send-c_embedded_blocks.ksh \ send-c_embedded_blocks.ksh \

4
tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh → tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
View File

@ -46,7 +46,7 @@ function cleanup
log_assert "Raw recursive sends preserve filesystem structure." log_assert "Raw recursive sends preserve filesystem structure."
log_onexit cleanup log_onexit cleanup
# Create the filesystem heirarchy # Create the filesystem hierarchy
log_must cleanup_pool $POOL log_must cleanup_pool $POOL
log_must eval "echo $PASSPHRASE | zfs create -o encryption=on" \ log_must eval "echo $PASSPHRASE | zfs create -o encryption=on" \
"-o keyformat=passphrase $POOL/$FS" "-o keyformat=passphrase $POOL/$FS"
@ -72,7 +72,7 @@ log_must verify_origin $POOL/clone "$POOL/$FS@snap"
log_must verify_encryption_root $POOL/$FS/child $POOL/$FS log_must verify_encryption_root $POOL/$FS/child $POOL/$FS
log_must verify_keylocation $POOL/$FS/child "none" log_must verify_keylocation $POOL/$FS/child "none"
# Alter the heirarchy and re-send # Alter the hierarchy and re-send
log_must eval "echo $PASSPHRASE1 | zfs change-key -o keyformat=passphrase" \ log_must eval "echo $PASSPHRASE1 | zfs change-key -o keyformat=passphrase" \
"$POOL/$FS/child" "$POOL/$FS/child"
log_must zfs promote $POOL/clone log_must zfs promote $POOL/clone