Mercurial > illumos > illumos-gate
changeset 12986:caf415d9aa53
6973547 zpool import succeeds but prints error message
| author | George Wilson <George.Wilson@Sun.COM> |
|---|---|
| date | Fri, 30 Jul 2010 16:21:50 -0700 |
| parents | d476be14f46f |
| children | 3086793bcf3c |
| files | usr/src/lib/libzfs/common/libzfs_pool.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libzfs/common/libzfs_pool.c Fri Jul 30 15:51:47 2010 -0700 +++ b/usr/src/lib/libzfs/common/libzfs_pool.c Fri Jul 30 16:21:50 2010 -0700 @@ -1453,7 +1453,7 @@ nvlist_free(props); return (-1); } - if (zcmd_alloc_dst_nvlist(hdl, &zc, 0) != 0) { + if (zcmd_alloc_dst_nvlist(hdl, &zc, zc.zc_nvlist_conf_size * 2) != 0) { nvlist_free(props); return (-1); } @@ -2905,7 +2905,7 @@ zpool_get_rewind_policy(rewindnvl, &policy); zc.zc_cookie = policy.zrp_request; - if (zcmd_alloc_dst_nvlist(hdl, &zc, 0) != 0) + if (zcmd_alloc_dst_nvlist(hdl, &zc, zhp->zpool_config_size * 2) != 0) return (-1); if (zcmd_write_src_nvlist(zhp->zpool_hdl, &zc, rewindnvl) != 0)