Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

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 (;;) {

lib/libzfs/libzfs_util.c

@@ -692,7 +692,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)

scripts/zpios-survey.sh

@@ -18,9 +18,9 @@ OPTIONS:
         -h      Show this message
         -v      Verbose
         -p      Enable profiling
-        -c     	Zpool configuration
+        -c      Zpool configuration
         -t      Zpios test
-	-l	Zpios survey log
+        -l      Zpios survey log
 
 EOF
 }
@@ -58,8 +58,8 @@ zpios_survey_prefetch() {
 
 	./zfs.sh ${VERBOSE_FLAG}               \
 		tee -a ${ZPIOS_SURVEY_LOG}
-	./zpios.sh ${VERBOSE_FLAG} -c ${ZPOOL_CONFIG} -t ${ZPIOS_TEST} | \
-		-o "--noprefetch" |                                      \
+	./zpios.sh ${VERBOSE_FLAG} -c ${ZPOOL_CONFIG} -t ${ZPIOS_TEST} \
+		-o "--noprefetch" |                                    \
 		tee -a ${ZPIOS_SURVEY_LOG}
 	./zfs.sh -u ${VERBOSE_FLAG} | \
 		tee -a ${ZPIOS_SURVEY_LOG}
@@ -193,7 +193,7 @@ while getopts 'hvpc:t:l:' OPTION; do
 done
 
 if [ $(id -u) != 0 ]; then
-        die "Must run as root"
+	die "Must run as root"
 fi
 
 zpios_survey_base