Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2010-06-29 10:25:31 -07:00
commit 9fd3ea941b
1 changed files with 1 additions and 4 deletions

View File

@ -357,7 +357,7 @@ traverse_impl(spa_t *spa, uint64_t objset, blkptr_t *rootbp,
uint64_t txg_start, int flags, blkptr_cb_t func, void *arg) uint64_t txg_start, int flags, blkptr_cb_t func, void *arg)
{ {
struct traverse_data td; struct traverse_data td;
struct prefetch_data pd; struct prefetch_data pd = { 0 };
zbookmark_t czb; zbookmark_t czb;
int err; int err;
@ -371,10 +371,7 @@ traverse_impl(spa_t *spa, uint64_t objset, blkptr_t *rootbp,
td.td_flags = flags; td.td_flags = flags;
pd.pd_blks_max = 100; pd.pd_blks_max = 100;
pd.pd_blks_fetched = 0;
pd.pd_flags = flags; pd.pd_flags = flags;
pd.pd_cancel = B_FALSE;
pd.pd_exited = B_FALSE;
mutex_init(&pd.pd_mtx, NULL, MUTEX_DEFAULT, NULL); mutex_init(&pd.pd_mtx, NULL, MUTEX_DEFAULT, NULL);
cv_init(&pd.pd_cv, NULL, CV_DEFAULT, NULL); cv_init(&pd.pd_cv, NULL, CV_DEFAULT, NULL);