diff options
| author | George Wilson <[email protected]> | 2013-04-10 16:58:22 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-04-12 09:01:36 -0700 |
| commit | 295304bed6fa6744b8d011e36b9c2180311cedb2 (patch) | |
| tree | 7c9744fb311f7126addb1a258e27988414845a50 /lib | |
| parent | 9d248f73a4941a5c5fdf5d701bee159aa6bdfa24 (diff) | |
Illumos #3422, #3425
3422 zpool create/syseventd race yield non-importable pool
3425 first write to a new zvol can fail with EFBIG
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
References:
illumos/illumos-gate@bda8819455defbccd06981d9a13b240b682a3d50
https://www.illumos.org/issues/3422
https://www.illumos.org/issues/3425
Ported-by: Brian Behlendorf <[email protected]>
Closes #1390
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libzfs/libzfs_import.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index 3d80224d9..791aaad53 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -523,13 +523,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, @@ -545,11 +544,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, |