diff options
| author | mm <mm@FreeBSD.org> | 2013-02-06 07:54:46 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-02-06 07:54:46 +0000 |
| commit | e2f7e2b3d500d3e2c132b5d0bc57a863a9cb58c6 (patch) | |
| tree | a0ea739823a5476f1142b27e1b67eaa5deff5e72 | |
| parent | b94c2686e785319885fa755b1a70edb9b242d25d (diff) | |
| download | FreeBSD-src-e2f7e2b3d500d3e2c132b5d0bc57a863a9cb58c6.zip FreeBSD-src-e2f7e2b3d500d3e2c132b5d0bc57a863a9cb58c6.tar.gz | |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13934:9e23a7f7b812
Illumos ZFS issues:
3422 zpool create/syseventd race yield non-importable pool
3425 first write to a new zvol can fail with EFBIG
| -rw-r--r-- | lib/libzfs/common/libzfs_import.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libzfs/common/libzfs_import.c b/lib/libzfs/common/libzfs_import.c index 36d7420..ee29c7b 100644 --- a/lib/libzfs/common/libzfs_import.c +++ b/lib/libzfs/common/libzfs_import.c @@ -528,13 +528,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, @@ -550,11 +549,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, |
