mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Fix typos in lib/
Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Closes #9237
This commit is contained in:
committed by
Tony Hutter
parent
7572926bc5
commit
6673ef3f6f
@@ -101,7 +101,7 @@
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* 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:
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -1452,7 +1452,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,
|
||||
@@ -1657,7 +1657,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
|
||||
|
||||
@@ -1531,7 +1531,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.
|
||||
@@ -4154,7 +4154,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.
|
||||
*/
|
||||
@@ -4782,7 +4782,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));
|
||||
}
|
||||
|
||||
@@ -4100,7 +4100,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
|
||||
|
||||
Reference in New Issue
Block a user