mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-18 10:21:01 +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:
parent
7572926bc5
commit
6673ef3f6f
@ -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
|
* 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
|
* The kernel creates this using the partition number when it
|
||||||
* populates /dev/ so it may be trusted. The tricky bit here is
|
* populates /dev/ so it may be trusted. The tricky bit here is
|
||||||
* that the naming convention is based on the block device type.
|
* 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
|
* 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.
|
* 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
|
* 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) ||
|
if ((efi_label->efi_parts[resv_index].p_size != EFI_MIN_RESV_SIZE) ||
|
||||||
(efi_label->efi_parts[resv_index].p_tag != V_RESERVED) ||
|
(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)
|
if ((rval = efi_get_info(fd, &dki_info)) != 0)
|
||||||
return (rval);
|
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) &&
|
if ((strncmp(dki_info.dki_cname, "pseudo", 7) == 0) &&
|
||||||
(strncmp(dki_info.dki_dname, "md", 3) == 0)) {
|
(strncmp(dki_info.dki_dname, "md", 3) == 0)) {
|
||||||
md_flag = 1;
|
md_flag = 1;
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
*
|
*
|
||||||
* TESTING
|
* TESTING
|
||||||
* Make sure that samba listens to 'localhost' (127.0.0.1) and that the options
|
* 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).
|
* accordingly (see zfs(8) for information).
|
||||||
*
|
*
|
||||||
* Once configuration in samba have been done, test that this
|
* Once configuration in samba have been done, test that this
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
|
pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Theses are the void returning variants
|
* These are the void returning variants
|
||||||
*/
|
*/
|
||||||
/* BEGIN CSTYLED */
|
/* BEGIN CSTYLED */
|
||||||
#define ATOMIC_INC(name, type) \
|
#define ATOMIC_INC(name, type) \
|
||||||
|
@ -79,7 +79,7 @@ extern void atomic_add_64(volatile uint64_t *, int64_t);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Substract delta from target
|
* Subtract delta from target
|
||||||
*/
|
*/
|
||||||
extern void atomic_sub_8(volatile uint8_t *, int8_t);
|
extern void atomic_sub_8(volatile uint8_t *, int8_t);
|
||||||
extern void atomic_sub_char(volatile uchar_t *, signed char);
|
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
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Substract delta from target
|
* Subtract delta from target
|
||||||
*/
|
*/
|
||||||
extern uint8_t atomic_sub_8_nv(volatile uint8_t *, int8_t);
|
extern uint8_t atomic_sub_8_nv(volatile uint8_t *, int8_t);
|
||||||
extern uchar_t atomic_sub_char_nv(volatile uchar_t *, signed char);
|
extern uchar_t atomic_sub_char_nv(volatile uchar_t *, signed char);
|
||||||
|
@ -82,7 +82,7 @@ typedef struct kstat {
|
|||||||
void *ks_data; /* kstat type-specific data */
|
void *ks_data; /* kstat type-specific data */
|
||||||
uint_t ks_ndata; /* # of type-specific data records */
|
uint_t ks_ndata; /* # of type-specific data records */
|
||||||
size_t ks_data_size; /* total size of kstat data section */
|
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
|
* Fields relevant to kernel only
|
||||||
*/
|
*/
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
* with smaller units (fragments) only in the last direct block.
|
* with smaller units (fragments) only in the last direct block.
|
||||||
* MAXBSIZE primarily determines the size of buffers in the buffer
|
* MAXBSIZE primarily determines the size of buffers in the buffer
|
||||||
* pool. It may be made larger without any effect on existing
|
* 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.
|
* systems unmountable.
|
||||||
*
|
*
|
||||||
* Note that the blocked devices are assumed to have DEV_BSIZE
|
* Note that the blocked devices are assumed to have DEV_BSIZE
|
||||||
|
@ -75,7 +75,7 @@ typedef enum xuio_type {
|
|||||||
|
|
||||||
typedef struct uioa_page_s { /* locked uio_iov state */
|
typedef struct uioa_page_s { /* locked uio_iov state */
|
||||||
int uioa_pfncnt; /* count of pfn_t(s) in *uioa_ppp */
|
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 */
|
caddr_t uioa_base; /* address base */
|
||||||
size_t uioa_len; /* span length */
|
size_t uioa_len; /* span length */
|
||||||
} uioa_page_t;
|
} uioa_page_t;
|
||||||
|
@ -51,7 +51,7 @@ extern "C" {
|
|||||||
* v_sanity returned as VTOC_SANE
|
* v_sanity returned as VTOC_SANE
|
||||||
* if Disk Label was sane
|
* if Disk Label was sane
|
||||||
* v_sectorsz returned as 512
|
* v_sectorsz returned as 512
|
||||||
* v_reserved [all] retunred as zero
|
* v_reserved [all] returned as zero
|
||||||
* timestamp [all] returned as zero
|
* timestamp [all] returned as zero
|
||||||
*
|
*
|
||||||
* See dklabel.h, read_vtoc(), and write_vtoc().
|
* See dklabel.h, read_vtoc(), and write_vtoc().
|
||||||
|
@ -128,7 +128,7 @@ mkdirp(const char *d, mode_t mode)
|
|||||||
* caller, or NULL is returned on error.
|
* caller, or NULL is returned on error.
|
||||||
*
|
*
|
||||||
* The caller should handle error reporting based upon the
|
* 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.
|
* when appropriate.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ tpool_worker(void *arg)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* This is the worker's main loop.
|
* 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();
|
active.tpa_tid = pthread_self();
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
@ -101,7 +101,7 @@
|
|||||||
* must display the following acknowledgement:
|
* must display the following acknowledgement:
|
||||||
* "This product includes cryptographic software written by
|
* "This product includes cryptographic software written by
|
||||||
* Eric Young (eay@cryptsoft.com)"
|
* 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 :-).
|
* being used are not cryptographic related :-).
|
||||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||||
* the apps directory (application code) you must include an acknowledgement:
|
* 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:
|
out:
|
||||||
if (isatty(fileno(fd))) {
|
if (isatty(fileno(fd))) {
|
||||||
/* reset the teminal */
|
/* reset the terminal */
|
||||||
(void) tcsetattr(fileno(fd), TCSAFLUSH, &old_term);
|
(void) tcsetattr(fileno(fd), TCSAFLUSH, &old_term);
|
||||||
(void) sigaction(SIGINT, &osigint, NULL);
|
(void) sigaction(SIGINT, &osigint, NULL);
|
||||||
(void) sigaction(SIGTSTP, &osigtstp, 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 (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.
|
* any properties not set by the user.
|
||||||
*/
|
*/
|
||||||
if (keyformat == ZFS_KEYFORMAT_NONE) {
|
if (keyformat == ZFS_KEYFORMAT_NONE) {
|
||||||
|
@ -1452,7 +1452,7 @@ badlabel:
|
|||||||
* There was an error in parsing so
|
* There was an error in parsing so
|
||||||
* deal with it by issuing an error
|
* deal with it by issuing an error
|
||||||
* message and leaving after
|
* message and leaving after
|
||||||
* uninitializing the the libshare
|
* uninitializing the libshare
|
||||||
* interface.
|
* interface.
|
||||||
*/
|
*/
|
||||||
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
|
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
|
* 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().
|
* Return codes must match zfs_add_synthetic_resv().
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
|
@ -1531,7 +1531,7 @@ zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot)
|
|||||||
|
|
||||||
case EOVERFLOW:
|
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
|
* SPA_MINDEVSIZE. Unfortunately, we can't detect which
|
||||||
* device was the problem device since there's no
|
* device was the problem device since there's no
|
||||||
* reliable way to determine device size from userland.
|
* 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
|
* Sort the resulting bookmarks. This is a little confusing due to the
|
||||||
* implementation of ZFS_IOC_ERROR_LOG. The bookmarks are copied last
|
* 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
|
* _not_ copied as part of the process. So we point the start of our
|
||||||
* array appropriate and decrement the total number of elements.
|
* 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) {
|
if (rval) {
|
||||||
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "freshly written "
|
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "freshly written "
|
||||||
"EFI label on '%s' is damaged. Ensure\nthis device "
|
"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);
|
path, rval);
|
||||||
return (zfs_error(hdl, EZFS_LABELFAILED, errbuf));
|
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
|
* 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
|
* used to blow away an existing encrypted filesystem. This
|
||||||
* is because it would require the dsl dir to point to the
|
* 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
|
* new key (or lack of a key) and the old key at the same
|
||||||
|
@ -1793,7 +1793,7 @@ zpool_find_import_scan_path(libpc_handle_t *hdl, pthread_mutex_t *lock,
|
|||||||
char *dpath, *name;
|
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
|
* path. We do this so that we can get the realpath of
|
||||||
* the directory. We don't get the realpath on the
|
* the directory. We don't get the realpath on the
|
||||||
* whole path because if it's a symlink, we want 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);
|
tpool_destroy(t);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Process the cache filtering out any entries which are not
|
* Process the cache, filtering out any entries which are not
|
||||||
* for the specificed pool then adding matching label configs.
|
* for the specified pool then adding matching label configs.
|
||||||
*/
|
*/
|
||||||
cookie = NULL;
|
cookie = NULL;
|
||||||
while ((slice = avl_destroy_nodes(cache, &cookie)) != NULL) {
|
while ((slice = avl_destroy_nodes(cache, &cookie)) != NULL) {
|
||||||
|
Loading…
Reference in New Issue
Block a user