summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/zdb/zdb.c4
-rw-r--r--cmd/zed/agents/zfs_agents.c2
-rw-r--r--cmd/zed/agents/zfs_mod.c2
-rw-r--r--cmd/zed/zed_disk_event.c2
-rw-r--r--cmd/zed/zed_exec.c2
-rw-r--r--cmd/zfs/zfs_main.c4
-rw-r--r--cmd/zinject/translate.c2
-rw-r--r--cmd/zinject/zinject.c2
-rw-r--r--cmd/zpios/zpios.h2
-rw-r--r--cmd/zpios/zpios_util.c2
-rw-r--r--cmd/zpool/zpool_main.c4
11 files changed, 14 insertions, 14 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 0614f9250..7768bb39a 100644
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -3249,7 +3249,7 @@ zdb_dump_block(char *label, void *buf, uint64_t size, int flags)
(void) printf("\n%s\n%6s %s 0123456789abcdef\n", label, "", hdr);
#ifdef _LITTLE_ENDIAN
- /* correct the endianess */
+ /* correct the endianness */
do_bswap = !do_bswap;
#endif
for (i = 0; i < nwords; i += 2) {
@@ -3271,7 +3271,7 @@ zdb_dump_block(char *label, void *buf, uint64_t size, int flags)
* child[.child]* - For example: 0.1.1
*
* The second form can be used to specify arbitrary vdevs anywhere
- * in the heirarchy. For example, in a pool with a mirror of
+ * in the hierarchy. For example, in a pool with a mirror of
* RAID-Zs, you can specify either RAID-Z vdev with 0.0 or 0.1 .
*/
static vdev_t *
diff --git a/cmd/zed/agents/zfs_agents.c b/cmd/zed/agents/zfs_agents.c
index 8779d5945..a40d59497 100644
--- a/cmd/zed/agents/zfs_agents.c
+++ b/cmd/zed/agents/zfs_agents.c
@@ -217,7 +217,7 @@ zfs_agent_dispatch(const char *class, const char *subclass, nvlist_t *nvl)
* On illumos these subscriptions reside in:
* /usr/lib/fm/fmd/plugins/zfs-retire.conf
*
- * NOTE: faults events come directy from our diagnosis engine
+ * NOTE: faults events come directly from our diagnosis engine
* and will not pass through the zfs kernel module.
*/
if (strcmp(class, FM_LIST_SUSPECT_CLASS) == 0 ||
diff --git a/cmd/zed/agents/zfs_mod.c b/cmd/zed/agents/zfs_mod.c
index 8733de596..d297ab294 100644
--- a/cmd/zed/agents/zfs_mod.c
+++ b/cmd/zed/agents/zfs_mod.c
@@ -477,7 +477,7 @@ zfs_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *data)
} else if (dp->dd_compare != NULL) {
/*
* NOTE: On Linux there is an event for partition, so unlike
- * illumos, substring matching is not required to accomodate
+ * illumos, substring matching is not required to accommodate
* the partition suffix. An exact match will be present in
* the dp->dd_compare value.
*/
diff --git a/cmd/zed/zed_disk_event.c b/cmd/zed/zed_disk_event.c
index 76b8e91c8..ae39bd6a9 100644
--- a/cmd/zed/zed_disk_event.c
+++ b/cmd/zed/zed_disk_event.c
@@ -185,7 +185,7 @@ zed_udev_monitor(void *arg)
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
/*
- * Strongly typed device is the prefered filter
+ * Strongly typed device is the preferred filter
*/
type = udev_device_get_property_value(dev, "ID_FS_TYPE");
if (type != NULL && type[0] != '\0') {
diff --git a/cmd/zed/zed_exec.c b/cmd/zed/zed_exec.c
index 075943f99..037037168 100644
--- a/cmd/zed/zed_exec.c
+++ b/cmd/zed/zed_exec.c
@@ -71,7 +71,7 @@ _zed_exec_create_env(zed_strings_t *zsp)
/*
* Fork a child process to handle event [eid]. The program [prog]
- * in directory [dir] is executed with the envionment [env].
+ * in directory [dir] is executed with the environment [env].
*
* The file descriptor [zfd] is the zevent_fd used to track the
* current cursor location within the zevent nvlist.
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 6e818afcb..c31f1b5d2 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -2174,7 +2174,7 @@ zfs_do_upgrade(int argc, char **argv)
if (cb.cb_numfailed != 0)
ret = 1;
} else {
- /* List old-version filesytems */
+ /* List old-version filesystems */
boolean_t found;
(void) printf(gettext("This system is currently running "
"ZFS filesystem version %llu.\n\n"), ZPL_VERSION);
@@ -3376,7 +3376,7 @@ zfs_do_promote(int argc, char **argv)
*
* -r Delete any intervening snapshots before doing rollback
* -R Delete any snapshots and their clones
- * -f ignored for backwards compatability
+ * -f ignored for backwards compatibility
*
* Given a filesystem, rollback to a specific snapshot, discarding any changes
* since then and making it the active dataset. If more recent snapshots exist,
diff --git a/cmd/zinject/translate.c b/cmd/zinject/translate.c
index 1aef074d3..00a071290 100644
--- a/cmd/zinject/translate.c
+++ b/cmd/zinject/translate.c
@@ -436,7 +436,7 @@ translate_raw(const char *str, zinject_record_t *record)
{
/*
* A raw bookmark of the form objset:object:level:blkid, where each
- * number is a hexidecimal value.
+ * number is a hexadecimal value.
*/
if (sscanf(str, "%llx:%llx:%x:%llx", (u_longlong_t *)&record->zi_objset,
(u_longlong_t *)&record->zi_object, &record->zi_level,
diff --git a/cmd/zinject/zinject.c b/cmd/zinject/zinject.c
index 2a7e607e4..604554e71 100644
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@@ -282,7 +282,7 @@ usage(void)
"\n"
"\t\tInject an error into pool 'pool' with the numeric bookmark\n"
"\t\tspecified by the remaining tuple. Each number is in\n"
- "\t\thexidecimal, and only one block can be specified.\n"
+ "\t\thexadecimal, and only one block can be specified.\n"
"\n"
"\tzinject [-q] <-t type> [-e errno] [-l level] [-r range]\n"
"\t [-a] [-m] [-u] [-f freq] <object>\n"
diff --git a/cmd/zpios/zpios.h b/cmd/zpios/zpios.h
index 4a69b9e54..e670354f4 100644
--- a/cmd/zpios/zpios.h
+++ b/cmd/zpios/zpios.h
@@ -1,7 +1,7 @@
/*
* ZPIOS is a heavily modified version of the original PIOS test code.
* It is designed to have the test code running in the Linux kernel
- * against ZFS while still being flexibly controled from user space.
+ * against ZFS while still being flexibly controlled from user space.
*
* Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
diff --git a/cmd/zpios/zpios_util.c b/cmd/zpios/zpios_util.c
index c45fc7066..77ca70f78 100644
--- a/cmd/zpios/zpios_util.c
+++ b/cmd/zpios/zpios_util.c
@@ -1,7 +1,7 @@
/*
* ZPIOS is a heavily modified version of the original PIOS test code.
* It is designed to have the test code running in the Linux kernel
- * against ZFS while still being flexibly controled from user space.
+ * against ZFS while still being flexibly controlled from user space.
*
* Copyright (C) 2008-2010 Lawrence Livermore National Security, LLC.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index f5740c00e..f4873cf19 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -1909,7 +1909,7 @@ show_import(nvlist_t *config)
case ZPOOL_STATUS_UNSUP_FEAT_READ:
(void) printf(gettext("status: The pool uses the following "
- "feature(s) not supported on this sytem:\n"));
+ "feature(s) not supported on this system:\n"));
zpool_print_unsup_feat(config);
break;
@@ -7251,7 +7251,7 @@ get_callback(zpool_handle_t *zhp, void *data)
* by a single tab.
* -o List of columns to display. Defaults to
* "name,property,value,source".
- * -p Diplay values in parsable (exact) format.
+ * -p Display values in parsable (exact) format.
*
* Get properties of pools in the system. Output space statistics
* for each one as well as other attributes.