Merge commit 'refs/top-bases/linux-docs' into linux-docs
This commit is contained in:
commit
f1d7c355b0
|
@ -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 (;;) {
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue