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

This commit is contained in:
Brian Behlendorf 2009-03-20 09:29:21 -07:00
commit 0c88bc3ccd
1 changed files with 1 additions and 1 deletions

View File

@ -2538,7 +2538,7 @@ ztest_dmu_commit_callbacks(ztest_args_t *za)
ztest_cb_list_t *zcl = &ztest_shared->zs_cb_list; ztest_cb_list_t *zcl = &ztest_shared->zs_cb_list;
ztest_cb_data_t *cb_data[3], *tmp_cb; ztest_cb_data_t *cb_data[3], *tmp_cb;
uint64_t old_txg, txg; uint64_t old_txg, txg;
int i, error; int i, error = 0;
tx = dmu_tx_create(os); tx = dmu_tx_create(os);