Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt

2009-03-20 09:30:03 -07:00 · 2009-03-20 09:30:03 -07:00 · daab277117
parent 1b88587905 f53e5a851d
commit daab277117
1 changed files with 1 additions and 1 deletions
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@ -2538,7 +2538,7 @@ ztest_dmu_commit_callbacks(ztest_args_t *za)
 	ztest_cb_list_t *zcl = &ztest_shared->zs_cb_list;
 	ztest_cb_data_t *cb_data[3], *tmp_cb;
 	uint64_t old_txg, txg;
-	int i, error;
+	int i, error = 0;

 	tx = dmu_tx_create(os);