Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
Correct various typos in the comments and tests.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Closes #10423
  • Loading branch information
Gelma authored Jun 10, 2020
1 parent 7bcb7f0 commit dd4bc56
Show file tree
Hide file tree
Showing 48 changed files with 74 additions and 73 deletions.
8 changes: 4 additions & 4 deletions COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion config/kernel-put-link.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion include/libzfs_impl.h
Original file line number Diff line number Diff line change
@@ -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").
Expand Down
2 changes: 1 addition & 1 deletion include/os/freebsd/spl/rpc/xdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/os/freebsd/spl/sys/callb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions include/os/freebsd/spl/sys/vnode_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
*
Expand Down
2 changes: 1 addition & 1 deletion include/os/linux/spl/sys/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion include/sys/btree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/sys/zfs_ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/sys/zfs_znode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/sys/zio_crypt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/libzfs/libzfs_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/libzfs/os/freebsd/libzfs_compat.c
Original file line number Diff line number Diff line change
@@ -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").
Expand Down
4 changes: 2 additions & 2 deletions lib/libzfs/os/freebsd/libzfs_fsshare.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion man/man5/zfs-module-parameters.5
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion man/man8/zdb.8
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion module/lua/ldo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion module/os/freebsd/zfs/zfs_ctldir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions module/os/freebsd/zfs/zfs_dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions module/os/freebsd/zfs/zfs_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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.
*/
Expand Down
5 changes: 3 additions & 2 deletions module/os/freebsd/zfs/zfs_vnops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions module/os/freebsd/zfs/zfs_znode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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|
Expand Down Expand Up @@ -938,7 +938,7 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp)
* 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);
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions module/os/freebsd/zfs/zio_crypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion module/unicode/u8_textprep.c
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@ collect_a_seq(size_t uv, uchar_t *u8s, uchar_t **source, uchar_t *slast,
}

/*
* 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
Expand Down
6 changes: 3 additions & 3 deletions module/zfs/abd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/arc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -8382,7 +8382,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
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
Expand Down
Loading

0 comments on commit dd4bc56

Please sign in to comment.