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

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

This commit is contained in:
Brian Behlendorf 2009-07-24 09:20:01 -07:00
parent 67624a608d e9dbc88719
commit dba29a5097
3 changed files with 7 additions and 7 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

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

10
scripts/zpios-survey.sh
View File

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