aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Gelmini <[email protected]>2019-09-03 02:53:27 +0200
committerBrian Behlendorf <[email protected]>2019-09-02 17:53:27 -0700
commit7859537768e030d0151a6d72a6b031751228bc85 (patch)
tree15fc02abdd255b0b32285746ebc30dc6f614ed93
parentc9539600484d8f89d48629eb5775c8b1967fe7d7 (diff)
Fix typos in lib/
Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Richard Laager <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Andrea Gelmini <[email protected]> Closes #9237
-rw-r--r--lib/libefi/rdwr_efi.c6
-rw-r--r--lib/libshare/smb.c2
-rw-r--r--lib/libspl/asm-generic/atomic.c2
-rw-r--r--lib/libspl/include/atomic.h4
-rw-r--r--lib/libspl/include/sys/kstat.h2
-rw-r--r--lib/libspl/include/sys/param.h2
-rw-r--r--lib/libspl/include/sys/uio.h2
-rw-r--r--lib/libspl/include/sys/vtoc.h2
-rw-r--r--lib/libspl/mkdirp.c2
-rw-r--r--lib/libtpool/thread_pool.c2
-rw-r--r--lib/libzfs/THIRDPARTYLICENSE.openssl2
-rw-r--r--lib/libzfs/libzfs_crypto.c4
-rw-r--r--lib/libzfs/libzfs_dataset.c4
-rw-r--r--lib/libzfs/libzfs_pool.c6
-rw-r--r--lib/libzfs/libzfs_sendrecv.c2
-rw-r--r--lib/libzfs_core/libzfs_core.c2
-rw-r--r--lib/libzutil/zutil_import.c6
17 files changed, 26 insertions, 26 deletions
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 93c79277d..5311059ee 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -224,7 +224,7 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
/*
* The simplest way to get the partition number under linux is
- * to parse it out of the /dev/<disk><parition> block device name.
+ * to parse it out of the /dev/<disk><partition> block device name.
* The kernel creates this using the partition number when it
* populates /dev/ so it may be trusted. The tricky bit here is
* that the naming convention is based on the block device type.
@@ -1198,7 +1198,7 @@ efi_use_whole_disk(int fd)
* Verify that we've found the reserved partition by checking
* that it looks the way it did when we created it in zpool_label_disk.
* If we've found the incorrect partition, then we know that this
- * device was reformatted and no longer is soley used by ZFS.
+ * device was reformatted and no longer is solely used by ZFS.
*/
if ((efi_label->efi_parts[resv_index].p_size != EFI_MIN_RESV_SIZE) ||
(efi_label->efi_parts[resv_index].p_tag != V_RESERVED) ||
@@ -1284,7 +1284,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
if ((rval = efi_get_info(fd, &dki_info)) != 0)
return (rval);
- /* check if we are dealing wih a metadevice */
+ /* check if we are dealing with a metadevice */
if ((strncmp(dki_info.dki_cname, "pseudo", 7) == 0) &&
(strncmp(dki_info.dki_dname, "md", 3) == 0)) {
md_flag = 1;
diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c
index 4c2045dfd..a95607ee0 100644
--- a/lib/libshare/smb.c
+++ b/lib/libshare/smb.c
@@ -29,7 +29,7 @@
*
* TESTING
* Make sure that samba listens to 'localhost' (127.0.0.1) and that the options
- * 'usershare max shares' and 'usershare owner only' have been rewied/set
+ * 'usershare max shares' and 'usershare owner only' have been reviewed/set
* accordingly (see zfs(8) for information).
*
* Once configuration in samba have been done, test that this
diff --git a/lib/libspl/asm-generic/atomic.c b/lib/libspl/asm-generic/atomic.c
index d0023b182..03f8ddcfa 100644
--- a/lib/libspl/asm-generic/atomic.c
+++ b/lib/libspl/asm-generic/atomic.c
@@ -37,7 +37,7 @@
pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
/*
- * Theses are the void returning variants
+ * These are the void returning variants
*/
/* BEGIN CSTYLED */
#define ATOMIC_INC(name, type) \
diff --git a/lib/libspl/include/atomic.h b/lib/libspl/include/atomic.h
index 7072a11bd..f8c257f96 100644
--- a/lib/libspl/include/atomic.h
+++ b/lib/libspl/include/atomic.h
@@ -79,7 +79,7 @@ extern void atomic_add_64(volatile uint64_t *, int64_t);
#endif
/*
- * Substract delta from target
+ * Subtract delta from target
*/
extern void atomic_sub_8(volatile uint8_t *, int8_t);
extern void atomic_sub_char(volatile uchar_t *, signed char);
@@ -173,7 +173,7 @@ extern uint64_t atomic_add_64_nv(volatile uint64_t *, int64_t);
#endif
/*
- * Substract delta from target
+ * Subtract delta from target
*/
extern uint8_t atomic_sub_8_nv(volatile uint8_t *, int8_t);
extern uchar_t atomic_sub_char_nv(volatile uchar_t *, signed char);
diff --git a/lib/libspl/include/sys/kstat.h b/lib/libspl/include/sys/kstat.h
index 9bd0d949d..69fb6d401 100644
--- a/lib/libspl/include/sys/kstat.h
+++ b/lib/libspl/include/sys/kstat.h
@@ -82,7 +82,7 @@ typedef struct kstat {
void *ks_data; /* kstat type-specific data */
uint_t ks_ndata; /* # of type-specific data records */
size_t ks_data_size; /* total size of kstat data section */
- hrtime_t ks_snaptime; /* time of last data shapshot */
+ hrtime_t ks_snaptime; /* time of last data snapshot */
/*
* Fields relevant to kernel only
*/
diff --git a/lib/libspl/include/sys/param.h b/lib/libspl/include/sys/param.h
index c22d508f9..26335187f 100644
--- a/lib/libspl/include/sys/param.h
+++ b/lib/libspl/include/sys/param.h
@@ -37,7 +37,7 @@
* with smaller units (fragments) only in the last direct block.
* MAXBSIZE primarily determines the size of buffers in the buffer
* pool. It may be made larger without any effect on existing
- * file systems; however making it smaller make make some file
+ * file systems; however making it smaller may make some file
* systems unmountable.
*
* Note that the blocked devices are assumed to have DEV_BSIZE
diff --git a/lib/libspl/include/sys/uio.h b/lib/libspl/include/sys/uio.h
index 97e8412ef..91ee3b3fd 100644
--- a/lib/libspl/include/sys/uio.h
+++ b/lib/libspl/include/sys/uio.h
@@ -75,7 +75,7 @@ typedef enum xuio_type {
typedef struct uioa_page_s { /* locked uio_iov state */
int uioa_pfncnt; /* count of pfn_t(s) in *uioa_ppp */
- void **uioa_ppp; /* page_t or pfn_t arrary */
+ void **uioa_ppp; /* page_t or pfn_t array */
caddr_t uioa_base; /* address base */
size_t uioa_len; /* span length */
} uioa_page_t;
diff --git a/lib/libspl/include/sys/vtoc.h b/lib/libspl/include/sys/vtoc.h
index 22a652b74..5d8448b62 100644
--- a/lib/libspl/include/sys/vtoc.h
+++ b/lib/libspl/include/sys/vtoc.h
@@ -51,7 +51,7 @@ extern "C" {
* v_sanity returned as VTOC_SANE
* if Disk Label was sane
* v_sectorsz returned as 512
- * v_reserved [all] retunred as zero
+ * v_reserved [all] returned as zero
* timestamp [all] returned as zero
*
* See dklabel.h, read_vtoc(), and write_vtoc().
diff --git a/lib/libspl/mkdirp.c b/lib/libspl/mkdirp.c
index 541741752..fce2c1c82 100644
--- a/lib/libspl/mkdirp.c
+++ b/lib/libspl/mkdirp.c
@@ -128,7 +128,7 @@ mkdirp(const char *d, mode_t mode)
* caller, or NULL is returned on error.
*
* The caller should handle error reporting based upon the
- * returned vlaue, and should free the returned value,
+ * returned value, and should free the returned value,
* when appropriate.
*/
diff --git a/lib/libtpool/thread_pool.c b/lib/libtpool/thread_pool.c
index a43fdd9cd..267fa834b 100644
--- a/lib/libtpool/thread_pool.c
+++ b/lib/libtpool/thread_pool.c
@@ -134,7 +134,7 @@ tpool_worker(void *arg)
/*
* This is the worker's main loop.
- * It will only be left if a timeout or an error has occured.
+ * It will only be left if a timeout or an error has occurred.
*/
active.tpa_tid = pthread_self();
for (;;) {
diff --git a/lib/libzfs/THIRDPARTYLICENSE.openssl b/lib/libzfs/THIRDPARTYLICENSE.openssl
index a2c4adcbe..92c9e196a 100644
--- a/lib/libzfs/THIRDPARTYLICENSE.openssl
+++ b/lib/libzfs/THIRDPARTYLICENSE.openssl
@@ -101,7 +101,7 @@
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young ([email protected])"
- * The word 'cryptographic' can be left out if the rouines from the library
+ * The word 'cryptographic' can be left out if the routines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c
index d31f43b1f..b7b567ef5 100644
--- a/lib/libzfs/libzfs_crypto.c
+++ b/lib/libzfs/libzfs_crypto.c
@@ -242,7 +242,7 @@ get_key_material_raw(FILE *fd, const char *fsname, zfs_keyformat_t keyformat,
out:
if (isatty(fileno(fd))) {
- /* reset the teminal */
+ /* reset the terminal */
(void) tcsetattr(fileno(fd), TCSAFLUSH, &old_term);
(void) sigaction(SIGINT, &osigint, NULL);
(void) sigaction(SIGTSTP, &osigtstp, NULL);
@@ -1321,7 +1321,7 @@ zfs_crypto_rewrap(zfs_handle_t *zhp, nvlist_t *raw_props, boolean_t inheritkey)
if (is_encroot) {
/*
- * If this is already an ecryption root, just keep
+ * If this is already an encryption root, just keep
* any properties not set by the user.
*/
if (keyformat == ZFS_KEYFORMAT_NONE) {
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 4285d1224..ef638a498 100644
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -1451,7 +1451,7 @@ badlabel:
* There was an error in parsing so
* deal with it by issuing an error
* message and leaving after
- * uninitializing the the libshare
+ * uninitializing the libshare
* interface.
*/
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@ -1656,7 +1656,7 @@ zfs_add_synthetic_resv(zfs_handle_t *zhp, nvlist_t *nvl)
/*
* Helper for 'zfs {set|clone} refreservation=auto'. Must be called after
- * zfs_valid_proplist(), as it is what sets the UINT64_MAX sentinal value.
+ * zfs_valid_proplist(), as it is what sets the UINT64_MAX sentinel value.
* Return codes must match zfs_add_synthetic_resv().
*/
static int
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 653335b6e..694497bc4 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -1524,7 +1524,7 @@ zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot)
case EOVERFLOW:
/*
- * This occurrs when one of the devices is below
+ * This occurs when one of the devices is below
* SPA_MINDEVSIZE. Unfortunately, we can't detect which
* device was the problem device since there's no
* reliable way to determine device size from userland.
@@ -4147,7 +4147,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
/*
* Sort the resulting bookmarks. This is a little confusing due to the
* implementation of ZFS_IOC_ERROR_LOG. The bookmarks are copied last
- * to first, and 'zc_nvlist_dst_size' indicates the number of boomarks
+ * to first, and 'zc_nvlist_dst_size' indicates the number of bookmarks
* _not_ copied as part of the process. So we point the start of our
* array appropriate and decrement the total number of elements.
*/
@@ -4775,7 +4775,7 @@ zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, char *name)
if (rval) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "freshly written "
"EFI label on '%s' is damaged. Ensure\nthis device "
- "is not in in use, and is functioning properly: %d"),
+ "is not in use, and is functioning properly: %d"),
path, rval);
return (zfs_error(hdl, EZFS_LABELFAILED, errbuf));
}
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index 9fdb99052..c178296f6 100644
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -4702,7 +4702,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
/*
* Raw sends can not be performed as an incremental on top
- * of existing unencryppted datasets. zfs recv -F cant be
+ * of existing unencrypted datasets. zfs recv -F can't be
* used to blow away an existing encrypted filesystem. This
* is because it would require the dsl dir to point to the
* new key (or lack of a key) and the old key at the same
diff --git a/lib/libzfs_core/libzfs_core.c b/lib/libzfs_core/libzfs_core.c
index d441f3655..a3dc70f9e 100644
--- a/lib/libzfs_core/libzfs_core.c
+++ b/lib/libzfs_core/libzfs_core.c
@@ -822,7 +822,7 @@ recv_impl(const char *snapname, nvlist_t *recvdprops, nvlist_t *localprops,
}
/*
- * All recives with a payload should use the new interface.
+ * All receives with a payload should use the new interface.
*/
if (resumable || raw || wkeydata != NULL || payload) {
nvlist_t *outnvl = NULL;
diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c
index e82744383..28733cc74 100644
--- a/lib/libzutil/zutil_import.c
+++ b/lib/libzutil/zutil_import.c
@@ -1793,7 +1793,7 @@ zpool_find_import_scan_path(libpc_handle_t *hdl, pthread_mutex_t *lock,
char *dpath, *name;
/*
- * Seperate the directory part and last part of the
+ * Separate the directory part and last part of the
* path. We do this so that we can get the realpath of
* the directory. We don't get the realpath on the
* whole path because if it's a symlink, we want the
@@ -2080,8 +2080,8 @@ zpool_find_import_impl(libpc_handle_t *hdl, importargs_t *iarg)
tpool_destroy(t);
/*
- * Process the cache filtering out any entries which are not
- * for the specificed pool then adding matching label configs.
+ * Process the cache, filtering out any entries which are not
+ * for the specified pool then adding matching label configs.
*/
cookie = NULL;
while ((slice = avl_destroy_nodes(cache, &cookie)) != NULL) {