svn commit: r251635 - in head: cddl/contrib/opensolaris/cmd/ztest sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Xin LI
delphij at FreeBSD.org
Tue Jun 11 19:29:32 UTC 2013
Author: delphij
Date: Tue Jun 11 19:29:31 2013
New Revision: 251635
URL: http://svnweb.freebsd.org/changeset/base/251635
Log:
MFV r251624:
txg commit callbacks don't work
Illumos ZFS issues:
3747 txg commit callbacks don't work
MFC after: 2 weeks
Modified:
head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
Directory Properties:
head/cddl/contrib/opensolaris/ (props changed)
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/ztest/ztest.c Tue Jun 11 19:25:49 2013 (r251634)
+++ head/cddl/contrib/opensolaris/cmd/ztest/ztest.c Tue Jun 11 19:29:31 2013 (r251635)
@@ -4509,7 +4509,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *z
*/
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);
}
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Tue Jun 11 19:25:49 2013 (r251634)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Tue Jun 11 19:29:31 2013 (r251635)
@@ -439,7 +439,7 @@ txg_dispatch_callbacks(dsl_pool_t *dp, u
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);
More information about the svn-src-all
mailing list