aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/avl/avl.c2
-rw-r--r--module/lua/llimits.h2
-rw-r--r--module/nvpair/nvpair.c6
-rw-r--r--module/spl/spl-condvar.c4
-rw-r--r--module/spl/spl-generic.c4
-rw-r--r--module/spl/spl-kmem-cache.c4
-rw-r--r--module/spl/spl-tsd.c4
-rw-r--r--module/zcommon/zfeature_common.c2
-rw-r--r--module/zcommon/zfs_namecheck.c2
-rw-r--r--module/zcommon/zpool_prop.c2
10 files changed, 16 insertions, 16 deletions
diff --git a/module/avl/avl.c b/module/avl/avl.c
index 736dcee84..1d2843f0e 100644
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -159,7 +159,7 @@ avl_walk(avl_tree_t *tree, void *oldnode, int left)
node = node->avl_child[right])
;
/*
- * Otherwise, return thru left children as far as we can.
+ * Otherwise, return through left children as far as we can.
*/
} else {
for (;;) {
diff --git a/module/lua/llimits.h b/module/lua/llimits.h
index eee8f0c2d..2126a1464 100644
--- a/module/lua/llimits.h
+++ b/module/lua/llimits.h
@@ -98,7 +98,7 @@ typedef LUAI_UACNUMBER l_uacNumber;
/*
** non-return type
**
-** Supress noreturn attribute in kernel builds to avoid objtool check warnings
+** Suppress noreturn attribute in kernel builds to avoid objtool check warnings
*/
#if defined(__GNUC__) && !defined(_KERNEL)
#define l_noret void __attribute__((noreturn))
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index 5f6423ccc..c5bd98ebd 100644
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -1872,7 +1872,7 @@ nvlist_lookup_pairs(nvlist_t *nvl, int flag, ...)
* (given 'ret' is non-NULL). If 'sep' is specified then 'name' will penitrate
* multiple levels of embedded nvlists, with 'sep' as the separator. As an
* example, if sep is '.', name might look like: "a" or "a.b" or "a.c[3]" or
- * "a.d[3].e[1]". This matches the C syntax for array embed (for convience,
+ * "a.d[3].e[1]". This matches the C syntax for array embed (for convenience,
* code also supports "a.d[3]e[1]" syntax).
*
* If 'ip' is non-NULL and the last name component is an array, return the
@@ -3105,7 +3105,7 @@ nvs_native(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
*
* An xdr packed nvlist is encoded as:
*
- * - encoding methode and host endian (4 bytes)
+ * - encoding method and host endian (4 bytes)
* - nvl_version (4 bytes)
* - nvl_nvflag (4 bytes)
*
@@ -3499,7 +3499,7 @@ nvs_xdr_nvp_size(nvstream_t *nvs, nvpair_t *nvp, size_t *size)
* the strings. These pointers are not encoded into the packed xdr buffer.
*
* If the data is of type DATA_TYPE_STRING_ARRAY and all the strings are
- * of length 0, then each string is endcoded in xdr format as a single word.
+ * of length 0, then each string is encoded in xdr format as a single word.
* Therefore when expanded to an nvpair there will be 2.25 word used for
* each string. (a int64_t allocated for pointer usage, and a single char
* for the null termination.)
diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c
index 664fae1e7..3cc33da62 100644
--- a/module/spl/spl-condvar.c
+++ b/module/spl/spl-condvar.c
@@ -431,8 +431,8 @@ __cv_signal(kcondvar_t *cvp)
/*
* All waiters are added with WQ_FLAG_EXCLUSIVE so only one
- * waiter will be set runable with each call to wake_up().
- * Additionally wake_up() holds a spin_lock assoicated with
+ * waiter will be set runnable with each call to wake_up().
+ * Additionally wake_up() holds a spin_lock associated with
* the wait queue to ensure we don't race waking up processes.
*/
if (atomic_read(&cvp->cv_waiters) > 0)
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index 3c5ef60bd..1deb2f444 100644
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -79,7 +79,7 @@ EXPORT_SYMBOL(p0);
* to generate words larger than 128 bits will paradoxically be limited to
* `2^128 - 1` possibilities. This is because we have a sequence of `2^128 - 1`
* 128-bit words and selecting the first will implicitly select the second. If
- * a caller finds this behavior undesireable, random_get_bytes() should be used
+ * a caller finds this behavior undesirable, random_get_bytes() should be used
* instead.
*
* XXX: Linux interrupt handlers that trigger within the critical section
@@ -207,7 +207,7 @@ nlz64(uint64_t x)
/*
* Newer kernels have a div_u64() function but we define our own
- * to simplify portibility between kernel versions.
+ * to simplify portability between kernel versions.
*/
static inline uint64_t
__div_u64(uint64_t u, uint32_t v)
diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c
index 44e112ccc..b39867b03 100644
--- a/module/spl/spl-kmem-cache.c
+++ b/module/spl/spl-kmem-cache.c
@@ -185,7 +185,7 @@ MODULE_PARM_DESC(spl_kmem_cache_kmem_threads,
struct list_head spl_kmem_cache_list; /* List of caches */
struct rw_semaphore spl_kmem_cache_sem; /* Cache list lock */
-taskq_t *spl_kmem_cache_taskq; /* Task queue for ageing / reclaim */
+taskq_t *spl_kmem_cache_taskq; /* Task queue for aging / reclaim */
static void spl_cache_shrink(spl_kmem_cache_t *skc, void *obj);
@@ -995,7 +995,7 @@ spl_kmem_cache_create(char *name, size_t size, size_t align,
#if defined(SLAB_USERCOPY)
/*
* Required for PAX-enabled kernels if the slab is to be
- * used for coping between user and kernel space.
+ * used for copying between user and kernel space.
*/
slabflags |= SLAB_USERCOPY;
#endif
diff --git a/module/spl/spl-tsd.c b/module/spl/spl-tsd.c
index 4c800292a..14342d5a6 100644
--- a/module/spl/spl-tsd.c
+++ b/module/spl/spl-tsd.c
@@ -42,7 +42,7 @@
* type is entry is called a 'key' entry and it is added to the hash during
* tsd_create(). It is used to store the address of the destructor function
* and it is used as an anchor point. All tsd entries which use the same
- * key will be linked to this entry. This is used during tsd_destory() to
+ * key will be linked to this entry. This is used during tsd_destroy() to
* quickly call the destructor function for all tsd associated with the key.
* The 'key' entry may be looked up with tsd_hash_search() by passing the
* key you wish to lookup and DTOR_PID constant as the pid.
@@ -269,7 +269,7 @@ tsd_hash_add_key(tsd_hash_table_t *table, uint_t *keyp, dtor_func_t dtor)
* @table: hash table
* @pid: search pid
*
- * For every process these is a single entry in the hash which is used
+ * For every process there is a single entry in the hash which is used
* as anchor. All other thread specific entries for this process are
* linked to this anchor via the 'he_pid_list' list head.
*/
diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c
index 8e1aef5da..e5a1aff9c 100644
--- a/module/zcommon/zfeature_common.c
+++ b/module/zcommon/zfeature_common.c
@@ -551,7 +551,7 @@ zpool_feature_init(void)
zfeature_register(SPA_FEATURE_RESILVER_DEFER,
"com.datto:resilver_defer", "resilver_defer",
- "Support for defering new resilvers when one is already running.",
+ "Support for deferring new resilvers when one is already running.",
ZFEATURE_FLAG_READONLY_COMPAT, ZFEATURE_TYPE_BOOLEAN, NULL);
}
diff --git a/module/zcommon/zfs_namecheck.c b/module/zcommon/zfs_namecheck.c
index 285f8b644..1649fd545 100644
--- a/module/zcommon/zfs_namecheck.c
+++ b/module/zcommon/zfs_namecheck.c
@@ -74,7 +74,7 @@ get_dataset_depth(const char *path)
/*
* Keep track of nesting until you hit the end of the
- * path or found the snapshot/bookmark seperator.
+ * path or found the snapshot/bookmark separator.
*/
for (int i = 0; loc[i] != '\0' &&
loc[i] != '@' &&
diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
index 539de5645..155d557f4 100644
--- a/module/zcommon/zpool_prop.c
+++ b/module/zcommon/zpool_prop.c
@@ -156,7 +156,7 @@ zpool_name_to_prop(const char *propname)
/*
* Given a pool property ID, returns the corresponding name.
- * Assuming the pool propety ID is valid.
+ * Assuming the pool property ID is valid.
*/
const char *
zpool_prop_to_name(zpool_prop_t prop)