Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2009-07-24 09:18:39 -07:00
parent 5cbe59a6e3 82ca18caae
commit 4865f95281
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzfs/libzfs_config.c
View File

@ -123,7 +123,7 @@ namespace_reload(libzfs_handle_t *hdl)
return (no_memory(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); return (-1);
for (;;) { for (;;) {

2
lib/libzfs/libzfs_util.c
View File

@ -680,7 +680,7 @@ int
zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len) zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
{ {
if (len == 0) if (len == 0)
len = 2048; len = 128*1024;
zc->zc_nvlist_dst_size = len; zc->zc_nvlist_dst_size = len;
if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t) if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0) zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)