From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 19:20:30 +0000 (-0700)
Subject: Merge branch 'fix-branch' into refs/top-bases/zfs-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~38^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8390fe4b4b7acf420d5e2e13f2822e100bace456;p=zfs

Merge branch 'fix-branch' into refs/top-bases/zfs-branch
---

8390fe4b4b7acf420d5e2e13f2822e100bace456
diff --cc lib/libzfs/libzfs_util.c
index 8d0c47e30,4da0fb44b..dfb24b329
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -685,10 -686,10 +685,10 @@@ in
  zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
  {
  	if (len == 0)
- 		len = 128*1024;
+ 		len = 2048;
  	zc->zc_nvlist_dst_size = len;
  	if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
 -	    zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == NULL)
 +	    zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)
  		return (-1);
  
  	return (0);