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

Resolve C99 complience issue introduce by patch

This commit is contained in:
Brian Behlendorf 2008-11-24 14:33:02 -08:00
parent f2e44250e6
commit 4b67af72f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zfs/lib/libzpool/txg.c
View File

@ -250,7 +250,7 @@ txg_rele_commit_cb(txg_handle_t *th, list_t *tx_callbacks)
int g = th->th_txg & TXG_MASK; int g = th->th_txg & TXG_MASK;
mutex_enter(&tc->tc_lock); mutex_enter(&tc->tc_lock);
while (dcb = list_head(tx_callbacks)) { while ((dcb = list_head(tx_callbacks))) {
list_remove(tx_callbacks, dcb); list_remove(tx_callbacks, dcb);
list_insert_tail(&tc->tc_callbacks[g], dcb); list_insert_tail(&tc->tc_callbacks[g], dcb);
} }
@ -298,7 +298,7 @@ txg_sync_thread(dsl_pool_t *dp)
tx_state_t *tx = &dp->dp_tx; tx_state_t *tx = &dp->dp_tx;
callb_cpr_t cpr; callb_cpr_t cpr;
uint64_t timeout, start, delta, timer; uint64_t timeout, start, delta, timer;
int target; int c, target;
txg_thread_enter(tx, &cpr); txg_thread_enter(tx, &cpr);
@ -361,12 +361,13 @@ txg_sync_thread(dsl_pool_t *dp)
* Call all the callbacks for this txg. The callbacks must * Call all the callbacks for this txg. The callbacks must
* call dmu_tx_callback_data_destroy to free memory. * call dmu_tx_callback_data_destroy to free memory.
*/ */
for (int c = 0; c < max_ncpus; c++) { for (c = 0; c < max_ncpus; c++) {
int g = txg & TXG_MASK; dmu_callback_t *dcb;
tx_cpu_t *tc = &tx->tx_cpu[c]; tx_cpu_t *tc = &tx->tx_cpu[c];
int g = txg & TXG_MASK;
/* No need to lock tx_cpu_t */ /* No need to lock tx_cpu_t */
while (dcb = list_head(&tc->tc_callbacks[g])) { while ((dcb = list_head(&tc->tc_callbacks[g]))) {
list_remove(&tc->tc_callbacks[g], dcb); list_remove(&tc->tc_callbacks[g], dcb);
dcb->dcb_func(dcb->dcb_data, 0); dcb->dcb_func(dcb->dcb_data, 0);
} }
@ -427,7 +428,6 @@ txg_quiesce_thread(dsl_pool_t *dp)
{ {
tx_state_t *tx = &dp->dp_tx; tx_state_t *tx = &dp->dp_tx;
callb_cpr_t cpr; callb_cpr_t cpr;
dmu_callback_t *dcb;
txg_thread_enter(tx, &cpr); txg_thread_enter(tx, &cpr);