Undo c89 workarounds to match with upstream

[mirror_zfs.git] / module / zfs / txg.c

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 65bd7f93acdf316fa462ac26bd47ff212fad06c4..078839a3203bc74ec124f24dee994ca6c2f860ef 100644 (file)
--- a/module/zfs/txg.c
+++ b/module/zfs/txg.c
@@ -108,8 +108,8 @@
  * now transition to the syncing state.
  */
 
-static void txg_sync_thread(dsl_pool_t *dp);
-static void txg_quiesce_thread(dsl_pool_t *dp);
+static void txg_sync_thread(void *arg);
+static void txg_quiesce_thread(void *arg);
 
 int zfs_txg_timeout = 5;       /* max seconds worth of delta per txg */
 
@@ -477,8 +477,9 @@ txg_wait_callbacks(dsl_pool_t *dp)
 }
 
 static void
-txg_sync_thread(dsl_pool_t *dp)
+txg_sync_thread(void *arg)
 {
+       dsl_pool_t *dp = arg;
        spa_t *spa = dp->dp_spa;
        tx_state_t *tx = &dp->dp_tx;
        callb_cpr_t cpr;
@@ -561,8 +562,9 @@ txg_sync_thread(dsl_pool_t *dp)
 }
 
 static void
-txg_quiesce_thread(dsl_pool_t *dp)
+txg_quiesce_thread(void *arg)
 {
+       dsl_pool_t *dp = arg;
        tx_state_t *tx = &dp->dp_tx;
        callb_cpr_t cpr;
 
@@ -783,9 +785,7 @@ txg_list_empty(txg_list_t *tl, uint64_t txg)
 boolean_t
 txg_all_lists_empty(txg_list_t *tl)
 {
-       int i;
-
-       for (i = 0; i < TXG_SIZE; i++) {
+       for (int i = 0; i < TXG_SIZE; i++) {
                if (!txg_list_empty(tl, i)) {
                        return (B_FALSE);
                }