svn commit: r342941 - in stable/11: cddl/contrib/opensolaris/cmd/zpool sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/sys/fs
Andriy Gapon
avg at FreeBSD.org
Fri Jan 11 11:46:35 UTC 2019
Author: avg
Date: Fri Jan 11 11:46:33 2019
New Revision: 342941
URL: https://svnweb.freebsd.org/changeset/base/342941
Log:
MFC r342541: MFV r342532: 5882 Temporary pool names
Note that this commit brings only formatting changes that were done
during the final review of the illumos change, because FreeBSD got the
main changes before illumos.
Modified:
stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jan 11 11:45:30 2019 (r342940)
+++ stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jan 11 11:46:33 2019 (r342941)
@@ -1273,7 +1273,7 @@ badusage:
/*
* zpool destroy <pool>
*
- * -f Forcefully unmount any datasets
+ * -f Forcefully unmount any datasets
*
* Destroy the given pool. Automatically unmounts any datasets in the pool.
*/
@@ -2165,8 +2165,8 @@ do_import(nvlist_t *config, const char *newname, const
* zpool checkpoint <pool>
* checkpoint --discard <pool>
*
- * -d Discard the checkpoint from a checkpointed
- * --discard pool.
+ * -d Discard the checkpoint from a checkpointed
+ * --discard pool.
*
* Checkpoints the specified pool, by taking a "snapshot" of its
* current state. A pool can only have one checkpoint at a time.
@@ -2242,45 +2242,45 @@ zpool_do_checkpoint(int argc, char **argv)
* [-d dir | -c cachefile] [-f] [-n] [-F] [-t]
* <pool | id> [newpool]
*
- * -c Read pool information from a cachefile instead of searching
+ * -c Read pool information from a cachefile instead of searching
* devices.
*
- * -d Scan in a specific directory, other than /dev/dsk. More than
+ * -d Scan in a specific directory, other than /dev/dsk. More than
* one directory can be specified using multiple '-d' options.
*
- * -D Scan for previously destroyed pools or import all or only
- * specified destroyed pools.
+ * -D Scan for previously destroyed pools or import all or only
+ * specified destroyed pools.
*
- * -R Temporarily import the pool, with all mountpoints relative to
+ * -R Temporarily import the pool, with all mountpoints relative to
* the given root. The pool will remain exported when the machine
* is rebooted.
*
- * -V Import even in the presence of faulted vdevs. This is an
- * intentionally undocumented option for testing purposes, and
- * treats the pool configuration as complete, leaving any bad
+ * -V Import even in the presence of faulted vdevs. This is an
+ * intentionally undocumented option for testing purposes, and
+ * treats the pool configuration as complete, leaving any bad
* vdevs in the FAULTED state. In other words, it does verbatim
* import.
*
- * -f Force import, even if it appears that the pool is active.
+ * -f Force import, even if it appears that the pool is active.
*
- * -F Attempt rewind if necessary.
+ * -F Attempt rewind if necessary.
*
- * -n See if rewind would work, but don't actually rewind.
+ * -n See if rewind would work, but don't actually rewind.
*
- * -N Import the pool but don't mount datasets.
+ * -N Import the pool but don't mount datasets.
*
- * -t Use newpool as a temporary pool name instead of renaming
- * the pool.
+ * -t Use newpool as a temporary pool name instead of renaming
+ * the pool.
*
- * -T Specify a starting txg to use for import. This option is
- * intentionally undocumented option for testing purposes.
+ * -T Specify a starting txg to use for import. This option is
+ * intentionally undocumented option for testing purposes.
*
- * -a Import all pools found.
+ * -a Import all pools found.
*
- * -o Set property=value and/or temporary mount options (without '=').
+ * -o Set property=value and/or temporary mount options (without '=').
*
- * --rewind-to-checkpoint
- * Import the pool and revert back to the checkpoint.
+ * --rewind-to-checkpoint
+ * Import the pool and revert back to the checkpoint.
*
* The import command scans for pools to import, and import pools based on pool
* name and GUID. The pool can also be renamed as part of the import process.
@@ -3440,7 +3440,7 @@ list_callback(zpool_handle_t *zhp, void *data)
* -o List of properties to display. Defaults to
* "name,size,allocated,free,expandsize,fragmentation,capacity,"
* "dedupratio,health,altroot"
- * -p Diplay values in parsable (exact) format.
+ * -p Diplay values in parsable (exact) format.
* -T Display a timestamp in date(1) or Unix format
*
* List all pools in the system, whether or not they're healthy. Output space
@@ -6083,7 +6083,7 @@ get_callback(zpool_handle_t *zhp, void *data)
* by a single tab.
* -o List of columns to display. Defaults to
* "name,property,value,source".
- * -p Diplay values in parsable (exact) format.
+ * -p Diplay values in parsable (exact) format.
*
* Get properties of pools in the system. Output space statistics
* for each one as well as other attributes.
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c Fri Jan 11 11:45:30 2019 (r342940)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c Fri Jan 11 11:46:33 2019 (r342941)
@@ -276,8 +276,8 @@ spa_write_cachefile(spa_t *target, boolean_t removing,
nvl = fnvlist_alloc();
if (spa->spa_import_flags & ZFS_IMPORT_TEMP_NAME) {
- pool_name = fnvlist_lookup_string(spa->spa_config,
- ZPOOL_CONFIG_POOL_NAME);
+ pool_name = fnvlist_lookup_string(
+ spa->spa_config, ZPOOL_CONFIG_POOL_NAME);
} else {
pool_name = spa_name(spa);
}
@@ -419,7 +419,7 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t t
*/
if (spa->spa_import_flags & ZFS_IMPORT_TEMP_NAME) {
pool_name = fnvlist_lookup_string(spa->spa_config,
- ZPOOL_CONFIG_POOL_NAME);
+ ZPOOL_CONFIG_POOL_NAME);
} else {
pool_name = spa_name(spa);
}
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Fri Jan 11 11:45:30 2019 (r342940)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Fri Jan 11 11:46:33 2019 (r342941)
@@ -879,7 +879,7 @@ typedef struct vdev_stat {
* is passed between kernel and userland as an nvlist uint64 array.
*/
typedef struct ddt_object {
- uint64_t ddo_count; /* number of elments in ddt */
+ uint64_t ddo_count; /* number of elments in ddt */
uint64_t ddo_dspace; /* size of ddt on disk */
uint64_t ddo_mspace; /* size of ddt in-core */
} ddt_object_t;
More information about the svn-src-all
mailing list