Fix hierarchy misspellings

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

diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index bcf0f43ce188f416819f247985b923d11c251632..d68efd96ebe367ac08467556759d8adc9be290e7 100644 (file)
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -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.

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index f57572dc21adedf0c20fbecc4706b263bb4dc0fa..f01a36da8bddb8893b965d3e0f8da290954e607d 100644 (file)
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -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_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
     '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_realloc_files', 'send_holds', 'send_hole_birth', 'send_mixed_raw',
     'send-wDR_encrypted_zvol']

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
index 3c909e458e74962c2bf2c55532c859cd501f09b5..04e9713124b16b56734963cfce158a58e206dc54 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
@@ -135,7 +135,7 @@ for obj in $child_fs $child_fs1 $ctr $ctr1; do
        log_mustnot zfs destroy -r $obj
        datasetexists $obj || \
                log_fail "'zfs destroy -r' fails to keep dependent " \
-                       "clone outside the hirearchy."
+                       "clone outside the hierarchy."
 done
 
 

diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am
index 22cafd19fb01e5c9baf0bb9252359a7a8bf234c2..24d4d61cd4d4920acd4c76a6c2ab6d1a8c3ddf14 100644 (file)
--- a/tests/zfs-tests/tests/functional/rsend/Makefile.am
+++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am
@@ -22,7 +22,7 @@ dist_pkgdata_SCRIPTS = \
        rsend_022_pos.ksh \
        rsend_024_pos.ksh \
        send_encrypted_files.ksh \
-       send_encrypted_heirarchy.ksh \
+       send_encrypted_hierarchy.ksh \
        send_encrypted_props.ksh \
        send-cD.ksh \
        send-c_embedded_blocks.ksh \

diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
similarity index 97%
rename from tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh
rename to tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
index 5e19a6b6c073adc0fcdae79fe228362224dfe47b..8417afc88d33cce4a9fc2cd0c43e0303f9fb1e1f 100755 (executable)
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
@@ -46,7 +46,7 @@ function cleanup
 log_assert "Raw recursive sends preserve filesystem structure."
 log_onexit cleanup
 
-# Create the filesystem heirarchy
+# Create the filesystem hierarchy
 log_must cleanup_pool $POOL
 log_must eval "echo $PASSPHRASE | zfs create -o encryption=on" \
        "-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_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" \
        "$POOL/$FS/child"
 log_must zfs promote $POOL/clone