diff options
| author | mm <mm@FreeBSD.org> | 2013-02-10 19:32:55 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-02-10 19:32:55 +0000 |
| commit | 81ba0e4f37bbec1f8c51a12e9826f9d6204bc23b (patch) | |
| tree | c8cf4be6038b52c5d2f587577edf83233825971b /cddl | |
| parent | a16dc1156cd46eec12f4e240a64b4d85c0c43b3c (diff) | |
| download | FreeBSD-src-81ba0e4f37bbec1f8c51a12e9826f9d6204bc23b.zip FreeBSD-src-81ba0e4f37bbec1f8c51a12e9826f9d6204bc23b.tar.gz | |
MFV r246388:
Import vendor bugfixes
Illumos ZFS issues:
3422 zpool create/syseventd race yield non-importable pool
3425 first write to a new zvol can fail with EFBIG
References:
https://www.illumos.org/issues/3422
https://www.illumos.org/issues/3425
MFC after: 2 weeks
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c index 7e39b0b..fa3d609 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c @@ -526,13 +526,12 @@ get_configs(libzfs_handle_t *hdl, pool_list_t *pl, boolean_t active_ok) * version * pool guid * name - * pool txg (if available) * comment (if available) * pool state * hostid (if available) * hostname (if available) */ - uint64_t state, version, pool_txg; + uint64_t state, version; char *comment = NULL; version = fnvlist_lookup_uint64(tmp, @@ -548,11 +547,6 @@ get_configs(libzfs_handle_t *hdl, pool_list_t *pl, boolean_t active_ok) fnvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME, name); - if (nvlist_lookup_uint64(tmp, - ZPOOL_CONFIG_POOL_TXG, &pool_txg) == 0) - fnvlist_add_uint64(config, - ZPOOL_CONFIG_POOL_TXG, pool_txg); - if (nvlist_lookup_string(tmp, ZPOOL_CONFIG_COMMENT, &comment) == 0) fnvlist_add_string(config, |
