Skip to content

Commit dd4bc56

Browse files
authored
Fix typos
Correct various typos in the comments and tests. Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Andrea Gelmini <[email protected]> Closes openzfs#10423
1 parent 7bcb7f0 commit dd4bc56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+74
-73
lines changed

COPYRIGHT

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ notable exceptions and their respective licenses include:
2020
* AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
2121
* PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
2222
* SPL Implementation: module/os/linux/spl/THIRDPARTYLICENSE.gplv2
23-
* GCM Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
24-
* GCM Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
25-
* GHASH Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
26-
* GHASH Implementaion: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
23+
* GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
24+
* GCM Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
25+
* GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
26+
* GHASH Implementation: module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
2727

2828
This product includes software developed by the OpenSSL Project for use
2929
in the OpenSSL Toolkit (http://www.openssl.org/)

config/kernel-put-link.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
2727
dnl #
2828
dnl # 4.5 API change
2929
dnl # get_link() uses delayed done, there is no put_link() interface.
30-
dnl # This check intially uses the inode_operations_get_link result
30+
dnl # This check initially uses the inode_operations_get_link result
3131
dnl #
3232
ZFS_LINUX_TEST_RESULT([inode_operations_get_link], [
3333
AC_DEFINE(HAVE_PUT_LINK_DELAYED, 1, [iops->put_link() delayed])

include/libzfs_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* CDDL HEADER SART
2+
* CDDL HEADER START
33
*
44
* The contents of this file are subject to the terms of the
55
* Common Development and Distribution License (the "License").

include/os/freebsd/spl/rpc/xdr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* program developed by the user.
88
*
99
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
10-
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
10+
* WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1111
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
1212
*
1313
* Sun RPC is provided with no support and without any obligation on the

include/os/freebsd/spl/sys/callb.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ typedef struct callb_cpr {
116116
*
117117
* cp - ptr to the callb_cpr_t structure for this kernel thread
118118
*
119-
* lockp - pointer to mutex protecting the callb_cpr_t stuct
119+
* lockp - pointer to mutex protecting the callb_cpr_t struct
120120
*
121121
* func - pointer to the callback function for this kernel thread.
122122
* It has the prototype boolean_t <func>(void *arg, int code)

include/os/freebsd/spl/sys/vnode_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* - a 32 bit quantity (xva_mapsize) that specifies the size of the
5656
* attribute bitmaps in 32 bit words.
5757
* - A pointer to the returned attribute bitmap (needed because the
58-
* previous element, the requested attribute bitmap) is variable lenth.
58+
* previous element, the requested attribute bitmap) is variable length.
5959
* - The requested attribute bitmap, which is an array of 32 bit words.
6060
* Callers use the XVA_SET_REQ() macro to set the bits corresponding to
6161
* the attributes that are being requested.
@@ -79,7 +79,7 @@
7979
* attributes to be requested/returned. File systems may or may not support
8080
* optional attributes. They do so at their own discretion but if they do
8181
* support optional attributes, they must register the VFSFT_XVATTR feature
82-
* so that the optional attributes can be set/retrived.
82+
* so that the optional attributes can be set/retrieved.
8383
*
8484
* The fields of the xvattr structure are:
8585
*

include/os/linux/spl/sys/trace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* module/zfs/vdev_removal.c including trace_vdev.h, DTRACE_PROBE calls
3939
* are mapped to stub functions calls and prototypes for those calls are
4040
* declared via DEFINE_DTRACE_PROBE*. Only module/zfs/trace.c defines
41-
* CREATE_TRACE_POINTS. That is follwed by includes of all the general
41+
* CREATE_TRACE_POINTS. That is followed by includes of all the general
4242
* tracing headers thereby defining all stub functions in one place via
4343
* the DEFINE_DTRACE_PROBE macros.
4444
*

include/sys/btree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern "C" {
4747
* at its children. Leaf nodes only contain data elements, and form the bottom
4848
* layer of the tree. Unlike B+ Trees, in this B-Tree implementation the
4949
* elements in the core nodes are not copies of or references to leaf node
50-
* elements. Each element occcurs only once in the tree, no matter what kind
50+
* elements. Each element occurs only once in the tree, no matter what kind
5151
* of node it is in.
5252
*
5353
* The tree's height is the same throughout, unlike many other forms of search

include/sys/zfs_ioctl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ typedef struct dmu_replay_record {
361361
} drr_redact;
362362

363363
/*
364-
* Nore: drr_checksum is overlaid with all record types
364+
* Note: drr_checksum is overlaid with all record types
365365
* except DRR_BEGIN. Therefore its (non-pad) members
366366
* must not overlap with members from the other structs.
367367
* We accomplish this by putting its members at the very

include/sys/zfs_znode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ typedef struct znode {
212212

213213
/*
214214
* Platform specific field, defined by each platform and only
215-
* accessable from platform specific code.
215+
* accessible from platform specific code.
216216
*/
217217
ZNODE_OS_FIELDS;
218218
} znode_t;

include/sys/zio_crypt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ typedef struct zio_crypt_key {
102102
crypto_key_t zk_current_key;
103103

104104
#if defined(__FreeBSD__) && defined(_KERNEL)
105-
/* Session for current encrpytion key. Must always be set */
105+
/* Session for current encryption key. Must always be set */
106106
freebsd_crypt_session_t zk_session;
107107
#else
108108
/* template of current encryption key for illumos crypto api */

lib/libzfs/libzfs_crypto.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ libzfs_getpassphrase(zfs_keyformat_t keyformat, boolean_t is_reenter,
326326
*reslen = bytes;
327327

328328
out:
329-
/* reset the teminal */
329+
/* reset the terminal */
330330
(void) tcsetattr(fileno(f), TCSAFLUSH, &old_term);
331331
(void) sigaction(SIGINT, &osigint, NULL);
332332
(void) sigaction(SIGTSTP, &osigtstp, NULL);

lib/libzfs/os/freebsd/libzfs_compat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* CDDL HEADER SART
2+
* CDDL HEADER START
33
*
44
* The contents of this file are subject to the terms of the
55
* Common Development and Distribution License (the "License").

lib/libzfs/os/freebsd/libzfs_fsshare.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ restart_mountd(void)
201201
/* Cannot open pidfile for some reason. */
202202
return;
203203
}
204-
/* We have mountd(8) PID in mountdpid varible. */
204+
/* We have mountd(8) PID in mountdpid variable. */
205205
kill(mountdpid, SIGHUP);
206206
}
207207

@@ -342,7 +342,7 @@ fsshare_main(const char *file, const char *mountpoint, const char *shareopts,
342342
error = 0;
343343
}
344344

345-
/* Place big, fat warning at the begining of the file. */
345+
/* Place big, fat warning at the beginning of the file. */
346346
fprintf(newfd, "%s", FILE_HEADER);
347347
while (oldfd != NULL && (line = zgetline(oldfd, mountpoint)) != NULL)
348348
fprintf(newfd, "%s\n", line);

man/man5/zfs-module-parameters.5

+1-1
Original file line numberDiff line numberDiff line change
@@ -2122,7 +2122,7 @@ Default value: \fB1,000\fR.
21222122
\fBzfs_obsolete_min_time_ms\fR (int)
21232123
.ad
21242124
.RS 12n
2125-
Simlar to \fBzfs_free_min_time_ms\fR but for cleanup of old indirection records
2125+
Similar to \fBzfs_free_min_time_ms\fR but for cleanup of old indirection records
21262126
for removed vdevs.
21272127
.sp
21282128
Default value: \fB500\fR.

man/man8/zdb.8

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ The fields
145145
.Ar start
146146
and
147147
.Ar end
148-
are integer object identfiers that denote the upper and lower bounds
148+
are integer object identifiers that denote the upper and lower bounds
149149
of the range. An
150150
.Ar end
151151
value of -1 specifies a range with no upper bound. The

module/lua/ldo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ extern void longjmp(label_t *) __attribute__((__noreturn__));
7878
#define LUAI_TRY(L,c,a) if (setjmp(&(c)->b) == 0) { a }
7979
#define luai_jmpbuf label_t
8080

81-
/* unsupported archs will build but not be able to run lua programs */
81+
/* unsupported arches will build but not be able to run lua programs */
8282
#if JMP_BUF_CNT == 1
8383
int setjmp (label_t *buf) {
8484
return 1;

module/os/freebsd/zfs/zfs_ctldir.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ typedef struct sfs_node {
107107

108108
/*
109109
* Check the parent's ID as well as the node's to account for a chance
110-
* that IDs originating from different domains (snapshot IDs, artifical
110+
* that IDs originating from different domains (snapshot IDs, artificial
111111
* IDs, znode IDs) may clash.
112112
*/
113113
static int

module/os/freebsd/zfs/zfs_dir.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#include <sys/dsl_dir.h>
6262

6363
/*
64-
* zfs_match_find() is used by zfs_dirent_lookup() to peform zap lookups
64+
* zfs_match_find() is used by zfs_dirent_lookup() to perform zap lookups
6565
* of names after deciding which is the appropriate lookup interface.
6666
*/
6767
static int
@@ -295,7 +295,7 @@ zfs_unlinked_drain(zfsvfs_t *zfsvfs)
295295
int error;
296296

297297
/*
298-
* Interate over the contents of the unlinked set.
298+
* Iterate over the contents of the unlinked set.
299299
*/
300300
for (zap_cursor_init(&zc, zfsvfs->z_os, zfsvfs->z_unlinkedobj);
301301
zap_cursor_retrieve(&zc, &zap) == 0;
@@ -508,7 +508,7 @@ zfs_rmnode(znode_t *zp)
508508
}
509509

510510
/*
511-
* FreeBSD's implemention of zfs_zget requires a vnode to back it.
511+
* FreeBSD's implementation of zfs_zget requires a vnode to back it.
512512
* This means that we could end up calling into getnewvnode while
513513
* calling zfs_rmnode as a result of a prior call to getnewvnode
514514
* trying to clear vnodes out of the cache. If this repeats we can

module/os/freebsd/zfs/zfs_vfsops.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
17461746
/*
17471747
* At this point there are no vops active, and any new vops will
17481748
* fail with EIO since we have z_teardown_lock for writer (only
1749-
* relavent for forced unmount).
1749+
* relevant for forced unmount).
17501750
*
17511751
* Release all holds on dbufs.
17521752
*/
@@ -2407,7 +2407,7 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value)
24072407
}
24082408

24092409
/*
2410-
* Return true if the coresponding vfs's unmounted flag is set.
2410+
* Return true if the corresponding vfs's unmounted flag is set.
24112411
* Otherwise return false.
24122412
* If this function returns true we know VFS unmount has been initiated.
24132413
*/

module/os/freebsd/zfs/zfs_vnops.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ page_busy(vnode_t *vp, int64_t start, int64_t off, int64_t nbytes)
385385
* aligned boundaries, if the range is not aligned. As a result a
386386
* DEV_BSIZE subrange with partially dirty data may get marked as clean.
387387
* It may happen that all DEV_BSIZE subranges are marked clean and thus
388-
* the whole page would be considred clean despite have some dirty data.
388+
* the whole page would be considered clean despite have some
389+
* dirty data.
389390
* For this reason we should shrink the range to DEV_BSIZE aligned
390391
* boundaries before calling vm_page_clear_dirty.
391392
*/
@@ -1139,7 +1140,7 @@ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr)
11391140

11401141
/*
11411142
* Clear Set-UID/Set-GID bits on successful write if not
1142-
* privileged and at least one of the excute bits is set.
1143+
* privileged and at least one of the execute bits is set.
11431144
*
11441145
* It would be nice to to this after all writes have
11451146
* been done, but that would still expose the ISUID/ISGID

module/os/freebsd/zfs/zfs_znode.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ zfs_vnode_forget(vnode_t *vp)
328328
}
329329

330330
/*
331-
* Construct a new znode/vnode and intialize.
331+
* Construct a new znode/vnode and initialize.
332332
*
333333
* This does not do a call to dmu_set_user() that is
334334
* up to the caller to do, in case you don't want to
@@ -604,7 +604,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
604604
pflags |= ZFS_XATTR;
605605

606606
/*
607-
* No execs denied will be deterimed when zfs_mode_compute() is called.
607+
* No execs denied will be determined when zfs_mode_compute() is called.
608608
*/
609609
pflags |= acl_ids->z_aclp->z_hints &
610610
(ZFS_ACL_TRIVIAL|ZFS_INHERIT_ACE|ZFS_ACL_AUTO_INHERIT|
@@ -938,7 +938,7 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp)
938938
* But that is only possible if the other thread peforms
939939
* a ZFS vnode operation on the vnode. That either
940940
* should not happen if the vnode is dead or the thread
941-
* should also have a refrence to the vnode and thus
941+
* should also have a reference to the vnode and thus
942942
* our reference is not last.
943943
*/
944944
VN_RELE(vp);
@@ -1099,7 +1099,7 @@ zfs_rezget(znode_t *zp)
10991099
* If the file has zero links, then it has been unlinked on the send
11001100
* side and it must be in the received unlinked set.
11011101
* We call zfs_znode_dmu_fini() now to prevent any accesses to the
1102-
* stale data and to prevent automatical removal of the file in
1102+
* stale data and to prevent automatically removal of the file in
11031103
* zfs_zinactive(). The file will be removed either when it is removed
11041104
* on the send side and the next incremental stream is received or
11051105
* when the unlinked set gets processed.

module/os/freebsd/zfs/zio_crypt.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ int failed_decrypt_size;
389389
* plaintext / ciphertext alone.
390390
*/
391391
/*
392-
* The implemenation for FreeBSD's OpenCrypto.
392+
* The implementation for FreeBSD's OpenCrypto.
393393
*
394394
* The big difference between ICP and FOC is that FOC uses a single
395395
* buffer for input and output. This means that (for AES-GCM, the
@@ -1229,9 +1229,9 @@ zio_crypt_do_indirect_mac_checksum_abd(boolean_t generate, abd_t *abd,
12291229
* the zil_chain_t header. Everything that is not encrypted is authenticated.
12301230
*/
12311231
/*
1232-
* The OpenCrypto used in FreeBSD does not use seperate source and
1232+
* The OpenCrypto used in FreeBSD does not use separate source and
12331233
* destination buffers; instead, the same buffer is used. Further, to
1234-
* accomodate some of the drivers, the authbuf needs to be logically before
1234+
* accommodate some of the drivers, the authbuf needs to be logically before
12351235
* the data. This means that we need to copy the source to the destination,
12361236
* and set up an extra iovec_t at the beginning to handle the authbuf.
12371237
* It also means we'll only return one uio_t, which we do via the clumsy

module/unicode/u8_textprep.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ collect_a_seq(size_t uv, uchar_t *u8s, uchar_t **source, uchar_t *slast,
17101710
}
17111711

17121712
/*
1713-
* The do_norm_compare() function does string comparion based on Unicode
1713+
* The do_norm_compare() function does string comparison based on Unicode
17141714
* simple case mappings and Unicode Normalization definitions.
17151715
*
17161716
* It does so by collecting a sequence of character at a time and comparing

module/zfs/abd.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
388388
/*
389389
* If the child ABD is already part of another
390390
* gang ABD then we must allocate a new
391-
* ABD to use a seperate link. We mark the newly
391+
* ABD to use a separate link. We mark the newly
392392
* allocated ABD with ABD_FLAG_GANG_FREE, before
393393
* adding it to the gang ABD's list, to make the
394394
* gang ABD aware that it is responsible to call
@@ -397,7 +397,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
397397
* data over into the newly allocated ABD.
398398
*
399399
* An ABD may become part of multiple gang ABD's. For
400-
* example, when writting ditto bocks, the same ABD
400+
* example, when writing ditto bocks, the same ABD
401401
* is used to write 2 or 3 locations with 2 or 3
402402
* zio_t's. Each of the zio's may be aggregated with
403403
* different adjacent zio's. zio aggregation uses gang
@@ -406,7 +406,7 @@ abd_gang_add(abd_t *pabd, abd_t *cabd, boolean_t free_on_free)
406406
*
407407
* The ASSERT below is to make sure that if
408408
* free_on_free is passed as B_TRUE, the ABD can
409-
* not be in mulitple gang ABD's. The gang ABD
409+
* not be in multiple gang ABD's. The gang ABD
410410
* can not be responsible for cleaning up the child
411411
* ABD memory allocation if the ABD can be in
412412
* multiple gang ABD's at one time.

module/zfs/arc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ static void l2arc_hdr_restore(const l2arc_log_ent_phys_t *le,
922922
static void l2arc_log_blk_commit(l2arc_dev_t *dev, zio_t *pio,
923923
l2arc_write_callback_t *cb);
924924

925-
/* L2ARC persistence auxilliary routines. */
925+
/* L2ARC persistence auxiliary routines. */
926926
boolean_t l2arc_log_blkptr_valid(l2arc_dev_t *dev,
927927
const l2arc_log_blkptr_t *lbp);
928928
static boolean_t l2arc_log_blk_insert(l2arc_dev_t *dev,
@@ -8382,7 +8382,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
83828382
rerun = B_FALSE;
83838383
if (dev->l2ad_hand >= (dev->l2ad_end - distance)) {
83848384
/*
8385-
* When there is no space to accomodate upcoming writes,
8385+
* When there is no space to accommodate upcoming writes,
83868386
* evict to the end. Then bump the write and evict hands
83878387
* to the start and iterate. This iteration does not
83888388
* happen indefinitely as we make sure in

0 commit comments

Comments
 (0)