summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Gelmini <[email protected]>2020-06-10 06:24:09 +0200
committerGitHub <[email protected]>2020-06-09 21:24:09 -0700
commitdd4bc569b9f73e8c2445bed90d82c92d98aada03 (patch)
tree64bacc1d16199ed350783f0b9a6490fe79ed6a70
parent7bcb7f0840d1857370dd1f9ee0ad48f9b7939dfd (diff)
Fix typos
Correct various typos in the comments and tests. Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Andrea Gelmini <[email protected]> Closes #10423
-rw-r--r--COPYRIGHT8
-rw-r--r--config/kernel-put-link.m42
-rw-r--r--include/libzfs_impl.h2
-rw-r--r--include/os/freebsd/spl/rpc/xdr.h2
-rw-r--r--include/os/freebsd/spl/sys/callb.h2
-rw-r--r--include/os/freebsd/spl/sys/vnode_impl.h4
-rw-r--r--include/os/linux/spl/sys/trace.h2
-rw-r--r--include/sys/btree.h2
-rw-r--r--include/sys/zfs_ioctl.h2
-rw-r--r--include/sys/zfs_znode.h2
-rw-r--r--include/sys/zio_crypt.h2
-rw-r--r--lib/libzfs/libzfs_crypto.c2
-rw-r--r--lib/libzfs/os/freebsd/libzfs_compat.c2
-rw-r--r--lib/libzfs/os/freebsd/libzfs_fsshare.c4
-rw-r--r--man/man5/zfs-module-parameters.52
-rw-r--r--man/man8/zdb.82
-rw-r--r--module/lua/ldo.c2
-rw-r--r--module/os/freebsd/zfs/zfs_ctldir.c2
-rw-r--r--module/os/freebsd/zfs/zfs_dir.c6
-rw-r--r--module/os/freebsd/zfs/zfs_vfsops.c4
-rw-r--r--module/os/freebsd/zfs/zfs_vnops.c5
-rw-r--r--module/os/freebsd/zfs/zfs_znode.c8
-rw-r--r--module/os/freebsd/zfs/zio_crypt.c6
-rw-r--r--module/unicode/u8_textprep.c2
-rw-r--r--module/zfs/abd.c6
-rw-r--r--module/zfs/arc.c4
-rw-r--r--module/zfs/btree.c10
-rw-r--r--module/zfs/dsl_bookmark.c2
-rw-r--r--module/zfs/metaslab.c2
-rw-r--r--module/zfs/vdev_raidz.c4
-rw-r--r--module/zfs/vdev_raidz_math_powerpc_altivec.c2
-rw-r--r--module/zfs/zfs_ioctl.c2
-rw-r--r--module/zfs/zvol.c2
-rw-r--r--tests/zfs-tests/cmd/mkbusy/mkbusy.c2
-rw-r--r--tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.set_props.zcp4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_multiple.ksh4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh2
-rw-r--r--tests/zfs-tests/tests/functional/history/history_common.kshlib2
-rwxr-xr-xtests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh4
-rwxr-xr-xtests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh2
48 files changed, 74 insertions, 73 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 4a93dc2fe..85556b542 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -20,10 +20,10 @@ notable exceptions and their respective licenses include:
* AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
* PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
* SPL Implementation: module/os/linux/spl/THIRDPARTYLICENSE.gplv2
- * GCM Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
- * GCM Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
- * GHASH Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
- * GHASH Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
+ * GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
+ * GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
+ * GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
+ * GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
This product includes software developed by the OpenSSL Project for use
in the OpenSSL Toolkit (http://www.openssl.org/)
diff --git a/config/kernel-put-link.m4 b/config/kernel-put-link.m4
index f03df9e99..4234861f3 100644
--- a/config/kernel-put-link.m4
+++ b/config/kernel-put-link.m4
@@ -27,7 +27,7 @@ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
dnl #
dnl # 4.5 API change
dnl # get_link() uses delayed done, there is no put_link() interface.
- dnl # This check intially uses the inode_operations_get_link result
+ dnl # This check initially uses the inode_operations_get_link result
dnl #
ZFS_LINUX_TEST_RESULT([inode_operations_get_link], [
AC_DEFINE(HAVE_PUT_LINK_DELAYED, 1, [iops->put_link() delayed])
diff --git a/include/libzfs_impl.h b/include/libzfs_impl.h
index 91fa1efbb..78b5a0586 100644
--- a/include/libzfs_impl.h
+++ b/include/libzfs_impl.h
@@ -1,5 +1,5 @@
/*
- * CDDL HEADER SART
+ * CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License (the "License").
diff --git a/include/os/freebsd/spl/rpc/xdr.h b/include/os/freebsd/spl/rpc/xdr.h
index b4df2c1ea..59d5e425b 100644
--- a/include/os/freebsd/spl/rpc/xdr.h
+++ b/include/os/freebsd/spl/rpc/xdr.h
@@ -7,7 +7,7 @@
* program developed by the user.
*
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
*
* Sun RPC is provided with no support and without any obligation on the
diff --git a/include/os/freebsd/spl/sys/callb.h b/include/os/freebsd/spl/sys/callb.h
index ed9ed8cd8..cc67b0263 100644
--- a/include/os/freebsd/spl/sys/callb.h
+++ b/include/os/freebsd/spl/sys/callb.h
@@ -116,7 +116,7 @@ typedef struct callb_cpr {
*
* cp - ptr to the callb_cpr_t structure for this kernel thread
*
- * lockp - pointer to mutex protecting the callb_cpr_t stuct
+ * lockp - pointer to mutex protecting the callb_cpr_t struct
*
* func - pointer to the callback function for this kernel thread.
* It has the prototype boolean_t <func>(void *arg, int code)
diff --git a/include/os/freebsd/spl/sys/vnode_impl.h b/include/os/freebsd/spl/sys/vnode_impl.h
index 78de740d9..94ec1ad4e 100644
--- a/include/os/freebsd/spl/sys/vnode_impl.h
+++ b/include/os/freebsd/spl/sys/vnode_impl.h
@@ -55,7 +55,7 @@
* - a 32 bit quantity (xva_mapsize) that specifies the size of the
* attribute bitmaps in 32 bit words.
* - A pointer to the returned attribute bitmap (needed because the
- * previous element, the requested attribute bitmap) is variable lenth.
+ * previous element, the requested attribute bitmap) is variable length.
* - The requested attribute bitmap, which is an array of 32 bit words.
* Callers use the XVA_SET_REQ() macro to set the bits corresponding to
* the attributes that are being requested.
@@ -79,7 +79,7 @@
* attributes to be requested/returned. File systems may or may not support
* optional attributes. They do so at their own discretion but if they do
* support optional attributes, they must register the VFSFT_XVATTR feature
- * so that the optional attributes can be set/retrived.
+ * so that the optional attributes can be set/retrieved.
*
* The fields of the xvattr structure are:
*
diff --git a/include/os/linux/spl/sys/trace.h b/include/os/linux/spl/sys/trace.h
index df859cf2f..55c587358 100644
--- a/include/os/linux/spl/sys/trace.h
+++ b/include/os/linux/spl/sys/trace.h
@@ -38,7 +38,7 @@
* module/zfs/vdev_removal.c including trace_vdev.h, DTRACE_PROBE calls
* are mapped to stub functions calls and prototypes for those calls are
* declared via DEFINE_DTRACE_PROBE*. Only module/zfs/trace.c defines
- * CREATE_TRACE_POINTS. That is follwed by includes of all the general
+ * CREATE_TRACE_POINTS. That is followed by includes of all the general
* tracing headers thereby defining all stub functions in one place via
* the DEFINE_DTRACE_PROBE macros.
*
diff --git a/include/sys/btree.h b/include/sys/btree.h
index 9fe2534df..3b53476c7 100644
--- a/include/sys/btree.h
+++ b/include/sys/btree.h
@@ -47,7 +47,7 @@ extern "C" {
* at its children. Leaf nodes only contain data elements, and form the bottom
* layer of the tree. Unlike B+ Trees, in this B-Tree implementation the
* elements in the core nodes are not copies of or references to leaf node
- * elements. Each element occcurs only once in the tree, no matter what kind
+ * elements. Each element occurs only once in the tree, no matter what kind
* of node it is in.
*
* The tree's height is the same throughout, unlike many other forms of search
diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h
index 78d33deda..100158b94 100644
--- a/include/sys/zfs_ioctl.h
+++ b/include/sys/zfs_ioctl.h
@@ -361,7 +361,7 @@ typedef struct dmu_replay_record {
} drr_redact;
/*
- * Nore: drr_checksum is overlaid with all record types
+ * Note: drr_checksum is overlaid with all record types
* except DRR_BEGIN. Therefore its (non-pad) members
* must not overlap with members from the other structs.
* We accomplish this by putting its members at the very
diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h
index 0e8d44637..d7823221e 100644
--- a/include/sys/zfs_znode.h
+++ b/include/sys/zfs_znode.h
@@ -212,7 +212,7 @@ typedef struct znode {
/*
* Platform specific field, defined by each platform and only
- * accessable from platform specific code.
+ * accessible from platform specific code.
*/
ZNODE_OS_FIELDS;
} znode_t;
diff --git a/include/sys/zio_crypt.h b/include/sys/zio_crypt.h
index fdd65f5a6..6b7bf719e 100644
--- a/include/sys/zio_crypt.h
+++ b/include/sys/zio_crypt.h
@@ -102,7 +102,7 @@ typedef struct zio_crypt_key {
crypto_key_t zk_current_key;
#if defined(__FreeBSD__) && defined(_KERNEL)
- /* Session for current encrpytion key. Must always be set */
+ /* Session for current encryption key. Must always be set */
freebsd_crypt_session_t zk_session;
#else
/* template of current encryption key for illumos crypto api */
diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c
index c83c213e3..1a2ee638a 100644
--- a/lib/libzfs/libzfs_crypto.c
+++ b/lib/libzfs/libzfs_crypto.c
@@ -326,7 +326,7 @@ libzfs_getpassphrase(zfs_keyformat_t keyformat, boolean_t is_reenter,
*reslen = bytes;
out:
- /* reset the teminal */
+ /* reset the terminal */
(void) tcsetattr(fileno(f), TCSAFLUSH, &old_term);
(void) sigaction(SIGINT, &osigint, NULL);
(void) sigaction(SIGTSTP, &osigtstp, NULL);
diff --git a/lib/libzfs/os/freebsd/libzfs_compat.c b/lib/libzfs/os/freebsd/libzfs_compat.c
index 3cb844ddb..3344d0e3d 100644
--- a/lib/libzfs/os/freebsd/libzfs_compat.c
+++ b/lib/libzfs/os/freebsd/libzfs_compat.c
@@ -1,5 +1,5 @@
/*
- * CDDL HEADER SART
+ * CDDL HEADER START
*
* The contents of this file are subject to the terms of the
* Common Development and Distribution License (the "License").
diff --git a/lib/libzfs/os/freebsd/libzfs_fsshare.c b/lib/libzfs/os/freebsd/libzfs_fsshare.c
index 0fd75bf2c..9074c33e0 100644
--- a/lib/libzfs/os/freebsd/libzfs_fsshare.c
+++ b/lib/libzfs/os/freebsd/libzfs_fsshare.c
@@ -201,7 +201,7 @@ restart_mountd(void)
/* Cannot open pidfile for some reason. */
return;
}
- /* We have mountd(8) PID in mountdpid varible. */
+ /* We have mountd(8) PID in mountdpid variable. */
kill(mountdpid, SIGHUP);
}
@@ -342,7 +342,7 @@ fsshare_main(const char *file, const char *mountpoint, const char *shareopts,
error = 0;
}
- /* Place big, fat warning at the begining of the file. */
+ /* Place big, fat warning at the beginning of the file. */
fprintf(newfd, "%s", FILE_HEADER);
while (oldfd != NULL && (line = zgetline(oldfd, mountpoint)) != NULL)
fprintf(newfd, "%s\n", line);
diff --git a/man/man5/zfs-module-parameters.5 b/man/man5/zfs-module-parameters.5
index 7ef82d9a0..1ab592390 100644
--- a/man/man5/zfs-module-parameters.5
+++ b/man/man5/zfs-module-parameters.5
@@ -2122,7 +2122,7 @@ Default value: \fB1,000\fR.
\fBzfs_obsolete_min_time_ms\fR (int)
.ad
.RS 12n
-Simlar to \fBzfs_free_min_time_ms\fR but for cleanup of old indirection records
+Similar to \fBzfs_free_min_time_ms\fR but for cleanup of old indirection records
for removed vdevs.
.sp
Default value: \fB500\fR.
diff --git a/man/man8/zdb.8 b/man/man8/zdb.8
index 01ad95b3e..e8320c35b 100644
--- a/man/man8/zdb.8
+++ b/man/man8/zdb.8
@@ -145,7 +145,7 @@ The fields
.Ar start
and
.Ar end
-are integer object identfiers that denote the upper and lower bounds
+are integer object identifiers that denote the upper and lower bounds
of the range. An
.Ar end
value of -1 specifies a range with no upper bound. The
diff --git a/module/lua/ldo.c b/module/lua/ldo.c
index d8c7742f3..88b22836f 100644
--- a/module/lua/ldo.c
+++ b/module/lua/ldo.c
@@ -78,7 +78,7 @@ extern void longjmp(label_t *) __attribute__((__noreturn__));
#define LUAI_TRY(L,c,a) if (setjmp(&(c)->b) == 0) { a }
#define luai_jmpbuf label_t
-/* unsupported archs will build but not be able to run lua programs */
+/* unsupported arches will build but not be able to run lua programs */
#if JMP_BUF_CNT == 1
int setjmp (label_t *buf) {
return 1;
diff --git a/module/os/freebsd/zfs/zfs_ctldir.c b/module/os/freebsd/zfs/zfs_ctldir.c
index ed6652c3b..fb0ffc082 100644
--- a/module/os/freebsd/zfs/zfs_ctldir.c
+++ b/module/os/freebsd/zfs/zfs_ctldir.c
@@ -107,7 +107,7 @@ typedef struct sfs_node {
/*
* Check the parent's ID as well as the node's to account for a chance
- * that IDs originating from different domains (snapshot IDs, artifical
+ * that IDs originating from different domains (snapshot IDs, artificial
* IDs, znode IDs) may clash.
*/
static int
diff --git a/module/os/freebsd/zfs/zfs_dir.c b/module/os/freebsd/zfs/zfs_dir.c
index 964033f8d..2c32602b1 100644
--- a/module/os/freebsd/zfs/zfs_dir.c
+++ b/module/os/freebsd/zfs/zfs_dir.c
@@ -61,7 +61,7 @@
#include <sys/dsl_dir.h>
/*
- * zfs_match_find() is used by zfs_dirent_lookup() to peform zap lookups
+ * zfs_match_find() is used by zfs_dirent_lookup() to perform zap lookups
* of names after deciding which is the appropriate lookup interface.
*/
static int
@@ -295,7 +295,7 @@ zfs_unlinked_drain(zfsvfs_t *zfsvfs)
int error;
/*
- * Interate over the contents of the unlinked set.
+ * Iterate over the contents of the unlinked set.
*/
for (zap_cursor_init(&zc, zfsvfs->z_os, zfsvfs->z_unlinkedobj);
zap_cursor_retrieve(&zc, &zap) == 0;
@@ -508,7 +508,7 @@ zfs_rmnode(znode_t *zp)
}
/*
- * FreeBSD's implemention of zfs_zget requires a vnode to back it.
+ * FreeBSD's implementation of zfs_zget requires a vnode to back it.
* This means that we could end up calling into getnewvnode while
* calling zfs_rmnode as a result of a prior call to getnewvnode
* trying to clear vnodes out of the cache. If this repeats we can
diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
index 317773e44..8a7626c86 100644
--- a/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -1746,7 +1746,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
/*
* At this point there are no vops active, and any new vops will
* fail with EIO since we have z_teardown_lock for writer (only
- * relavent for forced unmount).
+ * relevant for forced unmount).
*
* Release all holds on dbufs.
*/
@@ -2407,7 +2407,7 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value)
}
/*
- * Return true if the coresponding vfs's unmounted flag is set.
+ * Return true if the corresponding vfs's unmounted flag is set.
* Otherwise return false.
* If this function returns true we know VFS unmount has been initiated.
*/
diff --git a/module/os/freebsd/zfs/zfs_vnops.c b/module/os/freebsd/zfs/zfs_vnops.c
index ff842afb0..ca23026be 100644
--- a/module/os/freebsd/zfs/zfs_vnops.c
+++ b/module/os/freebsd/zfs/zfs_vnops.c
@@ -385,7 +385,8 @@ page_busy(vnode_t *vp, int64_t start, int64_t off, int64_t nbytes)
* aligned boundaries, if the range is not aligned. As a result a
* DEV_BSIZE subrange with partially dirty data may get marked as clean.
* It may happen that all DEV_BSIZE subranges are marked clean and thus
- * the whole page would be considred clean despite have some dirty data.
+ * the whole page would be considered clean despite have some
+ * dirty data.
* For this reason we should shrink the range to DEV_BSIZE aligned
* boundaries before calling vm_page_clear_dirty.
*/
@@ -1139,7 +1140,7 @@ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr)
/*
* Clear Set-UID/Set-GID bits on successful write if not
- * privileged and at least one of the excute bits is set.
+ * privileged and at least one of the execute bits is set.
*
* It would be nice to to this after all writes have
* been done, but that would still expose the ISUID/ISGID
diff --git a/module/os/freebsd/zfs/zfs_znode.c b/module/os/freebsd/zfs/zfs_znode.c
index b9d5472b2..e2f941415 100644
--- a/module/os/freebsd/zfs/zfs_znode.c
+++ b/module/os/freebsd/zfs/zfs_znode.c
@@ -328,7 +328,7 @@ zfs_vnode_forget(vnode_t *vp)
}
/*
- * Construct a new znode/vnode and intialize.
+ * Construct a new znode/vnode and initialize.
*
* This does not do a call to dmu_set_user() that is
* up to the caller to do, in case you don't want to
@@ -604,7 +604,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
pflags |= ZFS_XATTR;
/*
- * No execs denied will be deterimed when zfs_mode_compute() is called.
+ * No execs denied will be determined when zfs_mode_compute() is called.
*/
pflags |= acl_ids->z_aclp->z_hints &
(ZFS_ACL_TRIVIAL|ZFS_INHERIT_ACE|ZFS_ACL_AUTO_INHERIT|
@@ -938,7 +938,7 @@ again:
* But that is only possible if the other thread peforms
* a ZFS vnode operation on the vnode. That either
* should not happen if the vnode is dead or the thread
- * should also have a refrence to the vnode and thus
+ * should also have a reference to the vnode and thus
* our reference is not last.
*/
VN_RELE(vp);
@@ -1099,7 +1099,7 @@ zfs_rezget(znode_t *zp)
* If the file has zero links, then it has been unlinked on the send
* side and it must be in the received unlinked set.
* We call zfs_znode_dmu_fini() now to prevent any accesses to the
- * stale data and to prevent automatical removal of the file in
+ * stale data and to prevent automatically removal of the file in
* zfs_zinactive(). The file will be removed either when it is removed
* on the send side and the next incremental stream is received or
* when the unlinked set gets processed.
diff --git a/module/os/freebsd/zfs/zio_crypt.c b/module/os/freebsd/zfs/zio_crypt.c
index d6496a7ef..d89ef80ed 100644
--- a/module/os/freebsd/zfs/zio_crypt.c
+++ b/module/os/freebsd/zfs/zio_crypt.c
@@ -389,7 +389,7 @@ int failed_decrypt_size;
* plaintext / ciphertext alone.
*/
/*
- * The implemenation for FreeBSD's OpenCrypto.
+ * The implementation for FreeBSD's OpenCrypto.
*
* The big difference between ICP and FOC is that FOC uses a single
* buffer for input and output. This means that (for AES-GCM, the
@@ -1229,9 +1229,9 @@ zio_crypt_do_indirect_mac_checksum_abd(boolean_t generate, abd_t *abd,
* the zil_chain_t header. Everything that is not encrypted is authenticated.
*/
/*
- * The OpenCrypto used in FreeBSD does not use seperate source and
+ * The OpenCrypto used in FreeBSD does not use separate source and
* destination buffers; instead, the same buffer is used. Further, to
- * accomodate some of the drivers, the authbuf needs to be logically before
+ * accommodate some of the drivers, the authbuf needs to be logically before
* the data. This means that we need to copy the source to the destination,
* and set up an extra iovec_t at the beginning to handle the authbuf.
* It also means we'll only return one uio_t, which we do via the clumsy
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 11e7c1926..65f555d88 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -1710,7 +1710,7 @@ TURN_STREAM_SAFE:
}
/*
- * The do_norm_compare() function does string comparion based on Unicode
+ * The do_norm_compare() function does string comparison based on Unicode
* simple case mappings and Unicode Normalization definitions.
*
* It does so by collecting a sequence of character at a time and comparing
diff --git a/module/zfs/abd.c b/module/zfs/abd.c
index a3e58ebc5..269f2a7e5 100644
--- a/module/zfs/abd.c
+++ b/module/zfs/abd.c
@@ -388,7 +388,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
/*
* If the child ABD is already part of another
* gang ABD then we must allocate a new
- * ABD to use a seperate link. We mark the newly
+ * ABD to use a separate link. We mark the newly
* allocated ABD with ABD_FLAG_GANG_FREE, before
* adding it to the gang ABD's list, to make the
* gang ABD aware that it is responsible to call
@@ -397,7 +397,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
* data over into the newly allocated ABD.
*
* An ABD may become part of multiple gang ABD's. For
- * example, when writting ditto bocks, the same ABD
+ * example, when writing ditto bocks, the same ABD
* is used to write 2 or 3 locations with 2 or 3
* zio_t's. Each of the zio's may be aggregated with
* different adjacent zio's. zio aggregation uses gang
@@ -406,7 +406,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
*
* The ASSERT below is to make sure that if
* free_on_free is passed as B_TRUE, the ABD can
- * not be in mulitple gang ABD's. The gang ABD
+ * not be in multiple gang ABD's. The gang ABD
* can not be responsible for cleaning up the child
* ABD memory allocation if the ABD can be in
* multiple gang ABD's at one time.
diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index e7ad976af..c2e6720d3 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -922,7 +922,7 @@ static void l2arc_hdr_restore(const l2arc_log_ent_phys_t *le,
static void l2arc_log_blk_commit(l2arc_dev_t *dev, zio_t *pio,
l2arc_write_callback_t *cb);
-/* L2ARC persistence auxilliary routines. */
+/* L2ARC persistence auxiliary routines. */
boolean_t l2arc_log_blkptr_valid(l2arc_dev_t *dev,
const l2arc_log_blkptr_t *lbp);
static boolean_t l2arc_log_blk_insert(l2arc_dev_t *dev,
@@ -8382,7 +8382,7 @@ top:
rerun = B_FALSE;
if (dev->l2ad_hand >= (dev->l2ad_end - distance)) {
/*
- * When there is no space to accomodate upcoming writes,
+ * When there is no space to accommodate upcoming writes,
* evict to the end. Then bump the write and evict hands
* to the start and iterate. This iteration does not
* happen indefinitely as we make sure in
diff --git a/module/zfs/btree.c b/module/zfs/btree.c
index da1886a57..d9b908dd2 100644
--- a/module/zfs/btree.c
+++ b/module/zfs/btree.c
@@ -342,7 +342,7 @@ zfs_btree_find(zfs_btree_t *tree, const void *value, zfs_btree_index_t *where)
* * / * * * *\ * * * ... * * *
* ---------------
*
- * Note that a parellelogram shift is always shaped like a "left-leaning"
+ * Note that a parallelogram shift is always shaped like a "left-leaning"
* parallelogram, where the starting index of the children being moved is
* always one higher than the starting index of the elements being moved. No
* "right-leaning" parallelogram shifts are needed (shifts where the starting
@@ -578,7 +578,7 @@ zfs_btree_insert_into_parent(zfs_btree_t *tree, zfs_btree_hdr_t *old_node,
ASSERT3P(parent->btc_children[offset], ==, old_node);
/*
- * If the parent isn't full, shift things to accomodate our insertions
+ * If the parent isn't full, shift things to accommodate our insertions
* and return.
*/
if (par_hdr->bth_count != BTREE_CORE_ELEMS) {
@@ -651,7 +651,7 @@ zfs_btree_insert_into_parent(zfs_btree_t *tree, zfs_btree_hdr_t *old_node,
/*
* Move the new separator into the right half, and replace it
* with buf. We also need to shift back the elements in the
- * right half to accomodate new_node.
+ * right half to accommodate new_node.
*/
bt_shift_core_right(tree, new_parent, 0, move_count,
BSS_TRAPEZOID);
@@ -1366,7 +1366,7 @@ zfs_btree_remove_from_node(zfs_btree_t *tree, zfs_btree_core_t *node,
/*
* Now we try to take a node from a neighbor. We check left, then
* right. If the neighbor exists and has more than the minimum number
- * of elements, we move the separator betweeen us and them to our
+ * of elements, we move the separator between us and them to our
* node, move their closest element (last for left, first for right)
* to the separator, and move their closest child to our node. Along
* the way we need to collapse the gap made by idx, and (for our right
@@ -1625,7 +1625,7 @@ zfs_btree_remove_idx(zfs_btree_t *tree, zfs_btree_index_t *where)
/*
* Now we try to take a node from a sibling. We check left, then
* right. If they exist and have more than the minimum number of
- * elements, we move the separator betweeen us and them to our node
+ * elements, we move the separator between us and them to our node
* and move their closest element (last for left, first for right) to
* the separator. Along the way we need to collapse the gap made by
* idx, and (for our right neighbor) the gap made by removing their
diff --git a/module/zfs/dsl_bookmark.c b/module/zfs/dsl_bookmark.c
index 7e6a5ceaa..16bf2c441 100644
--- a/module/zfs/dsl_bookmark.c
+++ b/module/zfs/dsl_bookmark.c
@@ -123,7 +123,7 @@ dsl_bookmark_lookup(dsl_pool_t *dp, const char *fullname,
/*
* Validates that
* - bmark is a full dataset path of a bookmark (bookmark_namecheck)
- * - source is a full path of a snaphot or bookmark
+ * - source is a full path of a snapshot or bookmark
* ({bookmark,snapshot}_namecheck)
*
* Returns 0 if valid, -1 otherwise.
diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
index 1fc44399f..549055628 100644
--- a/module/zfs/metaslab.c
+++ b/module/zfs/metaslab.c
@@ -3547,7 +3547,7 @@ metaslab_condense(metaslab_t *msp, dmu_tx_t *tx)
* 4] At this point, we would ideally like to add all segments
* in the ms_allocatable tree from the condense tree. This way
* we would write all the entries of the condense tree as the
- * condensed space map, which would only contain freeed
+ * condensed space map, which would only contain freed
* segments with everything else assumed to be allocated.
*
* Doing so can be prohibitively expensive as ms_allocatable can
diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
index 3408ddf72..be3466673 100644
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@ -982,7 +982,7 @@ vdev_raidz_reconstruct_pq(raidz_map_t *rm, int *tgts, int ntgts)
/* BEGIN CSTYLED */
/*
* In the general case of reconstruction, we must solve the system of linear
- * equations defined by the coeffecients used to generate parity as well as
+ * equations defined by the coefficients used to generate parity as well as
* the contents of the data and parity disks. This can be expressed with
* vectors for the original data (D) and the actual data (d) and parity (p)
* and a matrix composed of the identity matrix (I) and a dispersal matrix (V):
@@ -996,7 +996,7 @@ vdev_raidz_reconstruct_pq(raidz_map_t *rm, int *tgts, int ntgts)
* ~~ ~~ ~~ ~~
*
* I is simply a square identity matrix of size n, and V is a vandermonde
- * matrix defined by the coeffecients we chose for the various parity columns
+ * matrix defined by the coefficients we chose for the various parity columns
* (1, 2, 4). Note that these values were chosen both for simplicity, speedy
* computation as well as linear separability.
*
diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec.c b/module/zfs/vdev_raidz_math_powerpc_altivec.c
index feabfa5c0..88f2646ae 100644
--- a/module/zfs/vdev_raidz_math_powerpc_altivec.c
+++ b/module/zfs/vdev_raidz_math_powerpc_altivec.c
@@ -4333,5 +4333,5 @@ __attribute__((aligned(256))) gf_clmul_mod_lt[4*256][16] = {
0xf8, 0x07, 0x06, 0xf9, 0x04, 0xfb, 0xfa, 0x05 }
};
/* END CSTYLED */
-#endif // ENDIANESS
+#endif // ENDIANNESS
#endif /* defined(__powerpc__) */
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 8b6dca18c..33e1620ec 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3520,7 +3520,7 @@ zfs_ioc_log_history(const char *unused, nvlist_t *innvl, nvlist_t *outnvl)
* of the grubenv file. The file is stored as raw ASCII, and is protected by
* an embedded checksum. By default, GRUB will check if the boot filesystem
* supports storing the environment data in a special location, and if so,
- * will invoke filesystem specific logic to retrieve it. This can be overriden
+ * will invoke filesystem specific logic to retrieve it. This can be overridden
* by a variable, should the user so desire.
*/
/* ARGSUSED */
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index bbda652ee..2b20b02e4 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -1717,7 +1717,7 @@ zvol_fini_impl(void)
/*
* The call to "zvol_remove_minors_impl" may dispatch entries to
- * the system_taskq, but it doesn't wait for those entires to
+ * the system_taskq, but it doesn't wait for those entries to
* complete before it returns. Thus, we must wait for all of the
* removals to finish, before we can continue.
*/
diff --git a/tests/zfs-tests/cmd/mkbusy/mkbusy.c b/tests/zfs-tests/cmd/mkbusy/mkbusy.c
index c26822bb5..a03076ffc 100644
--- a/tests/zfs-tests/cmd/mkbusy/mkbusy.c
+++ b/tests/zfs-tests/cmd/mkbusy/mkbusy.c
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
/*
* The argument supplied doesn't exist. Copy the path, and
- * remove the trailing slash if presnt.
+ * remove the trailing slash if present.
*/
if ((arg = strdup(argv[0])) == NULL)
fail("strdup", 1);
diff --git a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.set_props.zcp b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.set_props.zcp
index eade17aa8..756263a9d 100644
--- a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.set_props.zcp
+++ b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.set_props.zcp
@@ -64,7 +64,7 @@ neg_props["guid"] = { "12345" }
set_fail = {}
val_fail = {}
--- Test properies that should work
+-- Test properties that should work
for prop, values in pairs(pos_props) do
for i, val in ipairs(values) do
old_val, src = zfs.get_prop(fs, prop)
@@ -94,7 +94,7 @@ for prop, values in pairs(pos_props) do
end
end
--- Test properies that should fail
+-- Test properties that should fail
for prop, expected in pairs(neg_props) do
exp_val = expected[1]
exp_err = expected[2]
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh
index 4968e1507..563b3e00d 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/zfs_ids_to_path_001_pos.ksh
@@ -31,7 +31,7 @@
# filesystem, and verify that zfs_ids_to_path behaves correctly with them.
#
# STRATEGY:
-# 1. Create a dateset
+# 1. Create a dataset
# 2. Makes files in the dataset
# 3. Verify that zfs_ids_to_path outputs the correct format for each one
#
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_multiple.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_multiple.ksh
index 4a3b61c52..a8107b94e 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_multiple.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_multiple.ksh
@@ -19,7 +19,7 @@
#
# DESCRIPTION:
-# 'zpool wait' works when waiting for mulitple activities.
+# 'zpool wait' works when waiting for multiple activities.
#
# STRATEGY:
# 1. Create a pool with some data.
@@ -80,4 +80,4 @@ proc_must_exist $pid
log_must zpool initialize -s $TESTPOOL $DISK1
bkgrnd_proc_succeeded $pid
-log_pass "'zpool wait' works when waiting for mutliple activities."
+log_pass "'zpool wait' works when waiting for multiple activities."
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh
index ebe38b45d..f4819f37a 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_no_activity.ksh
@@ -23,7 +23,7 @@
#
# STRATEGY:
# 1. Create an empty pool with no activity
-# 2. Run zpool wait with various acitivies, make sure it always returns
+# 2. Run zpool wait with various activities, make sure it always returns
# promptly
#
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh
index 0604180b5..f047050ea 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh
@@ -38,7 +38,7 @@ function cleanup
[[ -d "$TESTDIR" ]] && log_must rm -r "$TESTDIR"
}
-# Check wether any vdevs in given pool are being trimmed
+# Check whether any vdevs in given pool are being trimmed
function trim_in_progress
{
typeset pool="$1"
diff --git a/tests/zfs-tests/tests/functional/history/history_common.kshlib b/tests/zfs-tests/tests/functional/history/history_common.kshlib
index 40daaa4d6..8ac34b2de 100644
--- a/tests/zfs-tests/tests/functional/history/history_common.kshlib
+++ b/tests/zfs-tests/tests/functional/history/history_common.kshlib
@@ -365,7 +365,7 @@ function verify_destroy
typeset cmd=$1
typeset flags=$3
- # This function doesn't currently verifiy the zpool command.
+ # This function doesn't currently verify the zpool command.
[[ ${cmd%% *} == "zfs" ]] || return 1
[[ $flags =~ "i" ]] || return 1
diff --git a/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh b/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
index 1bc8f72d6..a8934159b 100755
--- a/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
@@ -158,4 +158,4 @@ for volsize in $VOLSIZES; do
destroy_pool $TESTPOOL2
done
-log_pass "Dateset can be created, mounted & destroy in largest pool succeeded."
+log_pass "Dataset can be created, mounted & destroy in largest pool succeeded."
diff --git a/tests/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh b/tests/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
index 42e1f7320..470f10d93 100755
--- a/tests/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
@@ -40,7 +40,7 @@
# 1. Create a pool & dataset
# 2. Call readmmap binary
# 3. unmount this file system
-# 4. Verify the integrity of this pool & dateset
+# 4. Verify the integrity of this pool & dataset
#
verify_runnable "global"
diff --git a/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh b/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh
index ae219e01a..0184f06ef 100755
--- a/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_002_pos.ksh
@@ -29,13 +29,13 @@
# STRATEGY:
# 1. Create pool with a cache device.
# 2. Create a an encrypted ZFS file system.
-# 3. Create a random file in the encyrpted file system and random
+# 3. Create a random file in the encrypted file system and random
# read for 30 sec.
# 4. Export pool.
# 5. Read the amount of log blocks written from the header of the
# L2ARC device.
# 5. Import pool.
-# 6. Mount the encypted ZFS file system.
+# 6. Mount the encrypted ZFS file system.
# 7. Read the amount of log blocks rebuilt in arcstats and compare to
# (5).
# 8. Check if the labels of the L2ARC device are intact.
diff --git a/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh b/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh
index b2cad9d1f..9fc6a5923 100755
--- a/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh
+++ b/tests/zfs-tests/tests/functional/persist_l2arc/persist_l2arc_005_pos.ksh
@@ -34,7 +34,7 @@
# 4. Export pool.
# 5. Read amount of log blocks written.
# 6. Import pool.
-# 7. Mount the encypted ZFS file system.
+# 7. Mount the encrypted ZFS file system.
# 8. Read amount of log blocks built.
# 9. Compare the two amounts
# 10. Read the file written in (3) and check if l2_hits in
diff --git a/tests/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh b/tests/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh
index 0a51f1ef2..9af1c972f 100755
--- a/tests/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh
+++ b/tests/zfs-tests/tests/functional/resilver/resilver_restart_001.ksh
@@ -26,7 +26,7 @@
# DESCRIPTION:
# Testing resilver restart logic both with and without the deferred resilver
# feature enabled, verifying that resilver is not restarted when it is
-# unecessary.
+# unnecessary.
#
# STRATEGY:
# 1. Create a pool
diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
index 881f78d58..f7519eb6d 100755
--- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
@@ -37,7 +37,7 @@
# is full. The zfs file system should be stable and works well.
#
# STRATEGY:
-# 1. Create a pool & dateset
+# 1. Create a pool & dataset
# 2. Make directories in the zfs file system
# 3. Create 50 big files in each directories
# 4. Test case exit when the disk is full.
diff --git a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
index a0bc4ce32..07387017f 100755
--- a/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
@@ -37,7 +37,7 @@
# is full. The zfs file system should be work well and stable.
#
# STRATEGY:
-# 1. Create a pool & dateset
+# 1. Create a pool & dataset
# 2. Make directories in the zfs file system
# 3. Create 5000 files in each directories
# 4. Test case exit when the disk is full
diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
index 944a3d13c..888136fec 100755
--- a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
+++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh
@@ -25,7 +25,7 @@
# for all fio runs. The ARC is not cleared to ensure that all data is cached.
#
# This is basically a copy of the sequential_reads_cached test case, but with
-# a smaller dateset so that we can fit everything into the decompressed, linear
+# a smaller dataset so that we can fit everything into the decompressed, linear
# space in the dbuf cache.
#