From 08bfc9b7b61253430143167401b838c3d85f01d3 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Tue, 11 Jun 2013 18:43:25 +0000 Subject: [PATCH] Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 14050:0c8d9998d589 Illumos ZFS issues: 3747 txg commit callbacks don't work --- cmd/ztest/ztest.c | 2 +- uts/common/fs/zfs/txg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index ed460551c69c..980615eae0e5 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -4507,7 +4507,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id) */ tmp_cb = list_head(&zcl.zcl_callbacks); if (tmp_cb != NULL && - tmp_cb->zcd_txg > txg - ZTEST_COMMIT_CALLBACK_THRESH) { + (txg - ZTEST_COMMIT_CALLBACK_THRESH) > tmp_cb->zcd_txg) { fatal(0, "Commit callback threshold exceeded, oldest txg: %" PRIu64 ", open txg: %" PRIu64 "\n", tmp_cb->zcd_txg, txg); } diff --git a/uts/common/fs/zfs/txg.c b/uts/common/fs/zfs/txg.c index 50184b2eb015..a4bba8d2598f 100644 --- a/uts/common/fs/zfs/txg.c +++ b/uts/common/fs/zfs/txg.c @@ -435,7 +435,7 @@ txg_dispatch_callbacks(dsl_pool_t *dp, uint64_t txg) list_create(cb_list, sizeof (dmu_tx_callback_t), offsetof(dmu_tx_callback_t, dcb_node)); - list_move_tail(&tc->tc_callbacks[g], cb_list); + list_move_tail(cb_list, &tc->tc_callbacks[g]); (void) taskq_dispatch(tx->tx_commit_cb_taskq, (task_func_t *) txg_do_callbacks, cb_list, TQ_SLEEP);