diff options
author | Brian Behlendorf <[email protected]> | 2009-07-24 09:15:56 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2009-07-24 09:15:56 -0700 |
commit | 82ca18caaee24d4638c11377bef2734a8260be49 (patch) | |
tree | 82edba4b9aa9fc398be5edb62a3a49075d8faf0d | |
parent | bc8c87d2f39d6b67118fec2dba729578c169d088 (diff) | |
parent | 825c086a4e8fa865a18dddf3675a664eb9031eb0 (diff) |
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
-rw-r--r-- | lib/libzfs/libzfs_config.c | 2 | ||||
-rw-r--r-- | lib/libzfs/libzfs_util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_config.c b/lib/libzfs/libzfs_config.c index be96c4228..875af8d33 100644 --- a/lib/libzfs/libzfs_config.c +++ b/lib/libzfs/libzfs_config.c @@ -123,7 +123,7 @@ namespace_reload(libzfs_handle_t *hdl) return (no_memory(hdl)); } - if (zcmd_alloc_dst_nvlist(hdl, &zc, 32768) != 0) + if (zcmd_alloc_dst_nvlist(hdl, &zc, 0) != 0) return (-1); for (;;) { diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c index 66ec8a2df..39602d51f 100644 --- a/lib/libzfs/libzfs_util.c +++ b/lib/libzfs/libzfs_util.c @@ -680,7 +680,7 @@ int zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len) { if (len == 0) - len = 2048; + len = 128*1024; zc->zc_nvlist_dst_size = len; if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t) zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0) |