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

This commit is contained in:
Brian Behlendorf 2010-05-28 12:20:40 -07:00
commit 988e879fd8
1 changed files with 1 additions and 1 deletions

View File

@ -685,7 +685,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 = 128*1024; len = 2048;
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)