Skip to content

Commit

Permalink
Fix spelling
Browse files Browse the repository at this point in the history
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Haakan T Johansson <f96hajo@chalmers.se>
Closes #5547 
Closes #5543
  • Loading branch information
ka7 authored and behlendorf committed Jan 3, 2017
1 parent a5e046e commit 4e33ba4
Show file tree
Hide file tree
Showing 132 changed files with 170 additions and 170 deletions.
4 changes: 2 additions & 2 deletions cmd/zdb/zdb.c
Expand Up @@ -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) {
Expand All @@ -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 *
Expand Down
2 changes: 1 addition & 1 deletion cmd/zed/agents/zfs_agents.c
Expand Up @@ -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 ||
Expand Down
2 changes: 1 addition & 1 deletion cmd/zed/agents/zfs_mod.c
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion cmd/zed/zed_disk_event.c
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion cmd/zed/zed_exec.c
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/zfs/zfs_main.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cmd/zinject/translate.c
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cmd/zinject/zinject.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion 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).
Expand Down
2 changes: 1 addition & 1 deletion 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).
Expand Down
4 changes: 2 additions & 2 deletions cmd/zpool/zpool_main.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion config/kernel-mkdir-umode-t.m4
Expand Up @@ -4,7 +4,7 @@ dnl # The VFS .create, .mkdir and .mknod callbacks were updated to take a
dnl # umode_t type rather than an int. The expectation is that any backport
dnl # would also change all three prototypes. However, if it turns out that
dnl # some distribution doesn't backport the whole thing this could be
dnl # broken apart in to three seperate checks.
dnl # broken apart in to three separate checks.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
Expand Down
2 changes: 1 addition & 1 deletion config/kernel-xattr-handler.m4
Expand Up @@ -296,7 +296,7 @@ dnl #
AC_DEFUN([ZFS_AC_KERNEL_XATTR_HANDLER_LIST], [
dnl # 4.5 API change,
dnl # The xattr_handler->list() callback was changed to take only a
dnl # dentry and it only needs to return if it's accessable.
dnl # dentry and it only needs to return if it's accessible.
AC_MSG_CHECKING([whether xattr_handler->list() wants simple])
ZFS_LINUX_TRY_COMPILE([
#include <linux/xattr.h>
Expand Down
2 changes: 1 addition & 1 deletion config/user-commands.m4
Expand Up @@ -95,7 +95,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_COMMON], [
])

dnl #
dnl # Linux commands, used withing 'is_linux' blocks of test scripts.
dnl # Linux commands, used within 'is_linux' blocks of test scripts.
dnl # These commands may take different command line arguments.
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_COMMANDS_LINUX], [
Expand Down
12 changes: 6 additions & 6 deletions contrib/initramfs/scripts/zfs
Expand Up @@ -130,7 +130,7 @@ get_pools()
if [ -n "$npools" ]
then
# Because we have found extra pool(s) here, which wasn't
# found 'normaly', we need to force USE_DISK_BY_ID to
# found 'normally', we need to force USE_DISK_BY_ID to
# make sure we're able to actually import it/them later.
USE_DISK_BY_ID='yes'

Expand Down Expand Up @@ -195,7 +195,7 @@ import_pool()
# Make as sure as we can to not require '-f' to import.
"${ZPOOL}" status "$pool" > /dev/null 2>&1 && return 0

# For backwards compability, make sure that ZPOOL_IMPORT_PATH is set
# For backwards compatibility, make sure that ZPOOL_IMPORT_PATH is set
# to something we can use later with the real import(s). We want to
# make sure we find all by* dirs, BUT by-vdev should be first (if it
# exists).
Expand Down Expand Up @@ -485,7 +485,7 @@ destroy_fs()

# Clone snapshot $1 to destination filesystem $2
# Set 'canmount=noauto' and 'mountpoint=none' so that we get to keep
# manual controll over it's mounting (i.e., make sure it's not automatically
# manual control over it's mounting (i.e., make sure it's not automatically
# mounted with a 'zfs mount -a' in the init/systemd scripts).
clone_snap()
{
Expand All @@ -497,7 +497,7 @@ clone_snap()

# Clone the snapshot into a dataset we can boot from
# + We don't want this filesystem to be automatically mounted, we
# want controll over this here and nowhere else.
# want control over this here and nowhere else.
# + We don't need any mountpoint set for the same reason.
# We use the 'org.zol:mountpoint' property to remember the mountpoint.
ZFS_CMD="${ZFS} clone -o canmount=noauto -o mountpoint=none"
Expand Down Expand Up @@ -585,7 +585,7 @@ EOT
echo -n " Snap nr [0-$((i-1))]? " > /dev/stderr
read snapnr

# Reenable debugging.
# Re-enable debugging.
if [ -n "${debug}" ]; then
ZFS_DEBUG=1
set -x
Expand Down Expand Up @@ -795,7 +795,7 @@ mountroot()
# supported by ZoL (whatever it's for).
if [ -z "$ZFS_RPOOL" ]
then
# The ${zfs-bootfs} variable is set at the kernel commmand
# The ${zfs-bootfs} variable is set at the kernel command
# line, usually by GRUB, but it cannot be referenced here
# directly because bourne variable names cannot contain a
# hyphen.
Expand Down
8 changes: 4 additions & 4 deletions etc/init.d/zfs-import.in
Expand Up @@ -98,7 +98,7 @@ do_import_all_visible()
if [ -n "$npools" ]
then
# Because we have found extra pool(s) here, which wasn't
# found 'normaly', we need to force USE_DISK_BY_ID to
# found 'normally', we need to force USE_DISK_BY_ID to
# make sure we're able to actually import it/them later.
USE_DISK_BY_ID='yes'

Expand Down Expand Up @@ -148,7 +148,7 @@ do_import_all_visible()
available_pools="$apools"
fi

# For backwards compability, make sure that ZPOOL_IMPORT_PATH is set
# For backwards compatibility, make sure that ZPOOL_IMPORT_PATH is set
# to something we can use later with the real import(s). We want to
# make sure we find all by* dirs, BUT by-vdev should be first (if it
# exists).
Expand All @@ -157,7 +157,7 @@ do_import_all_visible()
local dirs
dirs="$(for dir in $(echo /dev/disk/by-*)
do
# Ignore by-vdev here - we wan't it first!
# Ignore by-vdev here - we want it first!
echo "$dir" | grep -q /by-vdev && continue
[ ! -d "$dir" ] && continue

Expand Down Expand Up @@ -217,7 +217,7 @@ do_import_all_visible()

# Import by using ZPOOL_IMPORT_PATH (either set above or in
# the config file) _or_ with the 'built in' default search
# paths. This is the prefered way.
# paths. This is the preferred way.
"$ZPOOL" import -N ${ZPOOL_IMPORT_OPTS} "$pool" 2> /dev/null
r="$?" ; RET=$((RET + r))
if [ "$r" -eq 0 ]
Expand Down
2 changes: 1 addition & 1 deletion etc/init.d/zfs-mount.in
Expand Up @@ -73,7 +73,7 @@ do_mount()
zfs_action "Mounting ZFS filesystem(s)" \
"$ZFS" mount -a$verbose$overlay "$MOUNT_EXTRA_OPTIONS"

# Require each volume/filesytem to have 'noauto' and no fsck
# Require each volume/filesystem to have 'noauto' and no fsck
# option. This shouldn't really be necessary, as long as one
# can get zfs-import to run sufficiently early on in the boot
# process - before local mounts. This is just here in case/if
Expand Down
2 changes: 1 addition & 1 deletion include/sys/arc_impl.h
Expand Up @@ -54,7 +54,7 @@ extern "C" {
* a DVA. These are buffers that hold dirty block copies
* before they are written to stable storage. By definition,
* they are "ref'd" and are considered part of arc_mru
* that cannot be freed. Generally, they will aquire a DVA
* that cannot be freed. Generally, they will acquire a DVA
* as they are written and migrate onto the arc_mru list.
*
* The ARC_l2c_only state is for buffers that are in the second
Expand Down
2 changes: 1 addition & 1 deletion include/sys/dnode.h
Expand Up @@ -266,7 +266,7 @@ struct dnode {
* duplicate entries, we order the dbufs by an arbitrary value -
* their address in memory. This means that dn_dbufs cannot be used to
* directly look up a dbuf. Instead, callers must use avl_walk, have
* a reference to the dbuf, or look up a non-existant node with
* a reference to the dbuf, or look up a non-existent node with
* db_state = DB_SEARCH (see dbuf_free_range for an example).
*/
avl_tree_t dn_dbufs;
Expand Down
2 changes: 1 addition & 1 deletion include/sys/efi_partition.h
Expand Up @@ -272,7 +272,7 @@ typedef struct efi_gpe_Attrs {
#define EFI_FREEDESKTOP_BOOT { 0xbc13c2ff, 0x59e6, 0x4262, 0xa3, 0x52, \
{ 0xb2, 0x75, 0xfd, 0x6f, 0x71, 0x72 } }

/* minimum # of bytes for partition table entires, per EFI spec */
/* minimum # of bytes for partition table entries, per EFI spec */
#define EFI_MIN_ARRAY_SIZE (16 * 1024)

#define EFI_PART_NAME_LEN 36
Expand Down
2 changes: 1 addition & 1 deletion include/sys/fs/zfs.h
Expand Up @@ -894,7 +894,7 @@ typedef struct vdev_stat_ex {
* is passed between kernel and userland as an nvlist uint64 array.
*/
typedef struct ddt_object {
uint64_t ddo_count; /* number of elments in ddt */
uint64_t ddo_count; /* number of elements in ddt */
uint64_t ddo_dspace; /* size of ddt on disk */
uint64_t ddo_mspace; /* size of ddt in-core */
} ddt_object_t;
Expand Down
2 changes: 1 addition & 1 deletion include/sys/metaslab_impl.h
Expand Up @@ -104,7 +104,7 @@ struct metaslab_class {

/*
* Metaslab groups encapsulate all the allocatable regions (i.e. metaslabs)
* of a top-level vdev. They are linked togther to form a circular linked
* of a top-level vdev. They are linked together to form a circular linked
* list and can belong to only one metaslab class. Metaslab groups may become
* ineligible for allocations for a number of reasons such as limited free
* space, fragmentation, or going offline. When this happens the allocator will
Expand Down
2 changes: 1 addition & 1 deletion include/sys/spa_impl.h
Expand Up @@ -270,7 +270,7 @@ struct spa {
uint64_t spa_errata; /* errata issues detected */
spa_stats_t spa_stats; /* assorted spa statistics */
hrtime_t spa_ccw_fail_time; /* Conf cache write fail time */
taskq_t *spa_zvol_taskq; /* Taskq for minor managment */
taskq_t *spa_zvol_taskq; /* Taskq for minor management */

/*
* spa_refcount & spa_config_lock must be the last elements
Expand Down
2 changes: 1 addition & 1 deletion include/sys/txg_impl.h
Expand Up @@ -65,7 +65,7 @@ extern "C" {
* grab all tc_open_locks, increment the tx_open_txg, and drop the locks.
* The tc_open_lock is held until the transaction is assigned into the
* transaction group. Typically, this is a short operation but if throttling
* is occuring it may be held for longer periods of time.
* is occurring it may be held for longer periods of time.
*/
struct tx_cpu {
kmutex_t tc_open_lock; /* protects tx_open_txg */
Expand Down
4 changes: 2 additions & 2 deletions include/sys/xvattr.h
Expand Up @@ -73,7 +73,7 @@ typedef struct xoptattr {
* - 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.
Expand All @@ -97,7 +97,7 @@ typedef struct xoptattr {
* 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:
*
Expand Down
2 changes: 1 addition & 1 deletion include/zpios-ctl.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).
Expand Down
2 changes: 1 addition & 1 deletion include/zpios-internal.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).
Expand Down
2 changes: 1 addition & 1 deletion lib/libshare/nfs.c
Expand Up @@ -723,7 +723,7 @@ nfs_check_exportfs(void)
}

/*
* Provides a convenient wrapper for determing nfs availability
* Provides a convenient wrapper for determining nfs availability
*/
static boolean_t
nfs_available(void)
Expand Down
2 changes: 1 addition & 1 deletion lib/libspl/include/atomic.h
Expand Up @@ -247,7 +247,7 @@ extern uint64_t atomic_swap_64(volatile uint64_t *, uint64_t);

/*
* Perform an exclusive atomic bit set/clear on a target.
* Returns 0 if bit was sucessfully set/cleared, or -1
* Returns 0 if bit was successfully set/cleared, or -1
* if the bit was already set/cleared.
*/
extern int atomic_set_long_excl(volatile ulong_t *, uint_t);
Expand Down
2 changes: 1 addition & 1 deletion lib/libspl/include/sys/dkio.h
Expand Up @@ -158,7 +158,7 @@ struct dk_geom {

/*
* The following ioctls are generic in nature and need to be
* suported as appropriate by all disk drivers
* supported as appropriate by all disk drivers
*/
#define DKIOCGGEOM (DKIOC|1) /* Get geometry */
#define DKIOCINFO (DKIOC|3) /* Get info */
Expand Down
2 changes: 1 addition & 1 deletion lib/libspl/include/sys/dklabel.h
Expand Up @@ -107,7 +107,7 @@ struct dk_map2 {

struct dkl_partition {
uint16_t p_tag; /* ID tag of partition */
uint16_t p_flag; /* permision flags */
uint16_t p_flag; /* permission flags */
daddr32_t p_start; /* start sector no of partition */
int32_t p_size; /* # of blocks in partition */
};
Expand Down
2 changes: 1 addition & 1 deletion lib/libzfs/libzfs_pool.c
Expand Up @@ -902,7 +902,7 @@ zpool_prop_get_feature(zpool_handle_t *zhp, const char *propname, char *buf,

/*
* Convert from feature name to feature guid. This conversion is
* unecessary for unsupported@... properties because they already
* unnecessary for unsupported@... properties because they already
* use guids.
*/
if (supported) {
Expand Down

0 comments on commit 4e33ba4

Please sign in to comment.