diff options
| -rwxr-xr-x | cmd/arc_summary/arc_summary3 | 14 | ||||
| -rw-r--r-- | cmd/arcstat/Makefile.am | 2 | ||||
| -rw-r--r-- | cmd/dbufstat/Makefile.am | 2 | ||||
| -rwxr-xr-x | cmd/fsck_zfs/fsck.zfs | 2 | ||||
| -rwxr-xr-x | cmd/vdev_id/vdev_id | 2 | ||||
| -rw-r--r-- | cmd/zdb/zdb.c | 2 | ||||
| -rw-r--r-- | cmd/zed/agents/fmd_api.c | 2 | ||||
| -rw-r--r-- | cmd/zed/agents/fmd_serd.c | 2 | ||||
| -rw-r--r-- | cmd/zed/agents/zfs_mod.c | 6 | ||||
| -rwxr-xr-x | cmd/zed/zed.d/statechange-led.sh | 4 | ||||
| -rw-r--r-- | cmd/zfs/zfs_main.c | 2 | ||||
| -rw-r--r-- | cmd/zinject/translate.c | 4 | ||||
| -rw-r--r-- | cmd/zpool/zpool_vdev.c | 4 | ||||
| -rw-r--r-- | cmd/zstreamdump/zstreamdump.c | 2 | ||||
| -rw-r--r-- | cmd/ztest/ztest.c | 2 |
15 files changed, 26 insertions, 26 deletions
diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3 index fc5e1e4b6..d33271438 100755 --- a/cmd/arc_summary/arc_summary3 +++ b/cmd/arc_summary/arc_summary3 @@ -43,7 +43,7 @@ import subprocess import sys import time -DECRIPTION = 'Print ARC and other statistics for ZFS on Linux' +DESCRIPTION = 'Print ARC and other statistics for ZFS on Linux' INDENT = ' '*8 LINE_LENGTH = 72 PROC_PATH = '/proc/spl/kstat/zfs/' @@ -65,7 +65,7 @@ SECTION_PATHS = {'arc': 'arcstats', 'zfetch': 'zfetchstats', 'zil': 'zil'} -parser = argparse.ArgumentParser(description=DECRIPTION) +parser = argparse.ArgumentParser(description=DESCRIPTION) parser.add_argument('-a', '--alternate', action='store_true', default=False, help='use alternate formatting for tunables and SPL', dest='alt') @@ -284,7 +284,7 @@ def get_spl_tunables(PATH): def get_descriptions(request): - """Get the decriptions of the Solaris Porting Layer (SPL) or the + """Get the descriptions of the Solaris Porting Layer (SPL) or the tunables, return with minimal formatting. """ @@ -708,7 +708,7 @@ def section_l2arc(kstats_dict): def section_spl(*_): """Print the SPL parameters, if requested with alternative format - and/or decriptions. This does not use kstats. + and/or descriptions. This does not use kstats. """ spls = get_spl_tunables(SPL_PATH) @@ -725,7 +725,7 @@ def section_spl(*_): try: print(INDENT+'#', descriptions[key]) except KeyError: - print(INDENT+'# (No decription found)') # paranoid + print(INDENT+'# (No description found)') # paranoid print(format_raw_line(key, value)) @@ -734,7 +734,7 @@ def section_spl(*_): def section_tunables(*_): """Print the tunables, if requested with alternative format and/or - decriptions. This does not use kstasts. + descriptions. This does not use kstasts. """ tunables = get_spl_tunables(TUNABLES_PATH) @@ -751,7 +751,7 @@ def section_tunables(*_): try: print(INDENT+'#', descriptions[key]) except KeyError: - print(INDENT+'# (No decription found)') # paranoid + print(INDENT+'# (No description found)') # paranoid print(format_raw_line(key, value)) diff --git a/cmd/arcstat/Makefile.am b/cmd/arcstat/Makefile.am index 462e9a619..2d59faa9c 100644 --- a/cmd/arcstat/Makefile.am +++ b/cmd/arcstat/Makefile.am @@ -1,7 +1,7 @@ dist_bin_SCRIPTS = arcstat # -# The arcstat script is compatibile with both Python 2.6 and 3.4. +# The arcstat script is compatible with both Python 2.6 and 3.4. # As such the python 3 shebang can be replaced at install time when # targeting a python 2 system. This allows us to maintain a single # version of the source. diff --git a/cmd/dbufstat/Makefile.am b/cmd/dbufstat/Makefile.am index 968a76077..06923d38b 100644 --- a/cmd/dbufstat/Makefile.am +++ b/cmd/dbufstat/Makefile.am @@ -1,7 +1,7 @@ dist_bin_SCRIPTS = dbufstat # -# The dbufstat script is compatibile with both Python 2.6 and 3.4. +# The dbufstat script is compatible with both Python 2.6 and 3.4. # As such the python 3 shebang can be replaced at install time when # targeting a python 2 system. This allows us to maintain a single # version of the source. diff --git a/cmd/fsck_zfs/fsck.zfs b/cmd/fsck_zfs/fsck.zfs index f1685db65..129a7f39c 100755 --- a/cmd/fsck_zfs/fsck.zfs +++ b/cmd/fsck_zfs/fsck.zfs @@ -1,6 +1,6 @@ #!/bin/sh # -# fsck.zfs: A fsck helper to accomidate distributions that expect +# fsck.zfs: A fsck helper to accommodate distributions that expect # to be able to execute a fsck on all filesystem types. Currently # this script does nothing but it could be extended to act as a # compatibility wrapper for 'zpool scrub'. diff --git a/cmd/vdev_id/vdev_id b/cmd/vdev_id/vdev_id index 3796ab488..a79aed3b5 100755 --- a/cmd/vdev_id/vdev_id +++ b/cmd/vdev_id/vdev_id @@ -102,7 +102,7 @@ Usage: vdev_id [-h] vdev_id <-d device> [-c config_file] [-p phys_per_port] [-g sas_direct|sas_switch|scsi] [-m] - -c specify name of alernate config file [default=$CONFIG] + -c specify name of an alternative config file [default=$CONFIG] -d specify basename of device (i.e. sda) -e Create enclose device symlinks only (/dev/by-enclosure) -g Storage network topology [default="$TOPOLOGY"] diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index e05323f0a..a6368c67d 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -5391,7 +5391,7 @@ zdb_set_skip_mmp(char *target) * the name of the target pool. * * Note that the checkpointed state's pool name will be the name of - * the original pool with the above suffix appened to it. In addition, + * the original pool with the above suffix appended to it. In addition, * if the target is not a pool name (e.g. a path to a dataset) then * the new_path parameter is populated with the updated path to * reflect the fact that we are looking into the checkpointed state. diff --git a/cmd/zed/agents/fmd_api.c b/cmd/zed/agents/fmd_api.c index ae90a322c..607b387ca 100644 --- a/cmd/zed/agents/fmd_api.c +++ b/cmd/zed/agents/fmd_api.c @@ -25,7 +25,7 @@ */ /* - * This file imlements the minimal FMD module API required to support the + * This file implements the minimal FMD module API required to support the * fault logic modules in ZED. This support includes module registration, * memory allocation, module property accessors, basic case management, * one-shot timers and SERD engines. diff --git a/cmd/zed/agents/fmd_serd.c b/cmd/zed/agents/fmd_serd.c index 043552862..d4ec37fb7 100644 --- a/cmd/zed/agents/fmd_serd.c +++ b/cmd/zed/agents/fmd_serd.c @@ -281,7 +281,7 @@ fmd_serd_eng_empty(fmd_serd_eng_t *sgp) void fmd_serd_eng_reset(fmd_serd_eng_t *sgp) { - serd_log_msg(" SERD Engine: reseting %s", sgp->sg_name); + serd_log_msg(" SERD Engine: resetting %s", sgp->sg_name); while (sgp->sg_count != 0) fmd_serd_eng_discard(sgp, list_head(&sgp->sg_list)); diff --git a/cmd/zed/agents/zfs_mod.c b/cmd/zed/agents/zfs_mod.c index 6d3e7cb11..d980794d0 100644 --- a/cmd/zed/agents/zfs_mod.c +++ b/cmd/zed/agents/zfs_mod.c @@ -157,7 +157,7 @@ zfs_unavail_pool(zpool_handle_t *zhp, void *data) * 1. physical match with no fs, no partition * tag it top, partition disk * - * 2. physical match again, see partion and tag + * 2. physical match again, see partition and tag * */ @@ -674,7 +674,7 @@ zfs_deliver_add(nvlist_t *nvl, boolean_t is_lofi) devid, devpath ? devpath : "NULL", is_slice); /* - * Iterate over all vdevs looking for a match in the folllowing order: + * Iterate over all vdevs looking for a match in the following order: * 1. ZPOOL_CONFIG_DEVID (identifies the unique disk) * 2. ZPOOL_CONFIG_PHYS_PATH (identifies disk physical location). * @@ -892,7 +892,7 @@ zfs_enum_pools(void *arg) * * sent messages from zevents or udev monitor * - * For now, each agent has it's own libzfs instance + * For now, each agent has its own libzfs instance */ int zfs_slm_init() diff --git a/cmd/zed/zed.d/statechange-led.sh b/cmd/zed/zed.d/statechange-led.sh index 6484b7959..e656e125d 100755 --- a/cmd/zed/zed.d/statechange-led.sh +++ b/cmd/zed/zed.d/statechange-led.sh @@ -20,7 +20,7 @@ # # Exit codes: # 0: enclosure led successfully set -# 1: enclosure leds not not available +# 1: enclosure leds not available # 2: enclosure leds administratively disabled # 3: The led sysfs path passed from ZFS does not exist # 4: $ZPOOL not set @@ -68,7 +68,7 @@ check_and_set_led() # timeout. for _ in $(seq 1 5); do # We want to check the current state first, since writing to the - # 'fault' entry always always causes a SES command, even if the + # 'fault' entry always causes a SES command, even if the # current state is already what you want. current=$(cat "${file}") diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 53b76e25d..e6b597825 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -8061,7 +8061,7 @@ zfs_do_change_key(int argc, char **argv) * 4) zfs project [-p id] [-r] [-s] <file|directory ...> * Set project ID and/or inherit flag on the file(s) or directories. * -p: Set the project ID as the given id. - * -r: Set on subdirectorie recursively. If not specify "-p" option, + * -r: Set on subdirectories recursively. If not specify "-p" option, * it will use top-level directory's project ID as the given id, * then set both project ID and inherit flag on all descendants * of the top-level directory. diff --git a/cmd/zinject/translate.c b/cmd/zinject/translate.c index 700961b06..d4795d071 100644 --- a/cmd/zinject/translate.c +++ b/cmd/zinject/translate.c @@ -176,7 +176,7 @@ object_from_path(const char *dataset, uint64_t object, zinject_record_t *record) } /* - * Intialize the range based on the type, level, and range given. + * Initialize the range based on the type, level, and range given. */ static int initialize_range(err_type_t type, int level, char *range, @@ -310,7 +310,7 @@ translate_record(err_type_t type, const char *object, const char *range, ziprintf("raw object: %llu\n", record->zi_object); /* - * For the given object, intialize the range in bytes + * For the given object, initialize the range in bytes */ if (initialize_range(type, level, (char *)range, record) != 0) goto err; diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c index 52c696816..ef2a30996 100644 --- a/cmd/zpool/zpool_vdev.c +++ b/cmd/zpool/zpool_vdev.c @@ -438,7 +438,7 @@ check_disk(const char *path, blkid_cache cache, int force, } /* - * Expected to fail for non-EFI labled disks. Just check the device + * Expected to fail for non-EFI labeled disks. Just check the device * as given and do not attempt to detect and scan partitions. */ err = efi_alloc_and_read(fd, &vtoc); @@ -1867,7 +1867,7 @@ make_root_vdev(zpool_handle_t *zhp, nvlist_t *props, int force, int check_rep, } /* - * Validate each device to make sure that its not shared with another + * Validate each device to make sure that it's not shared with another * subsystem. We do this even if 'force' is set, because there are some * uses (such as a dedicated dump device) that even '-f' cannot * override. diff --git a/cmd/zstreamdump/zstreamdump.c b/cmd/zstreamdump/zstreamdump.c index 5f2813ce6..4c996ae55 100644 --- a/cmd/zstreamdump/zstreamdump.c +++ b/cmd/zstreamdump/zstreamdump.c @@ -197,7 +197,7 @@ print_block(char *buf, int length) } /* - * Print an array of bytes to stdout as hexidecimal characters. str must + * Print an array of bytes to stdout as hexadecimal characters. str must * have buf_len * 2 + 1 bytes of space. */ static void diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 01421e85b..24ea49c10 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -74,7 +74,7 @@ * * To turn this into an overnight stress test, use -T to specify run time. * - * You can ask more more vdevs [-v], datasets [-d], or threads [-t] + * You can ask more vdevs [-v], datasets [-d], or threads [-t] * to increase the pool capacity, fanout, and overall stress level. * * Use the -k option to set the desired frequency of kills. |