summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2010-05-21 09:35:28 +0000
committermm <mm@FreeBSD.org>2010-05-21 09:35:28 +0000
commit71313e529c8e699d28c5847cca2a02357379914f (patch)
treebd688d84db95eec00092769e23323090995dfa63 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
parentc5161d1ad5baa751d09569af1e5c06e990e4edaa (diff)
downloadFreeBSD-src-71313e529c8e699d28c5847cca2a02357379914f.zip
FreeBSD-src-71313e529c8e699d28c5847cca2a02357379914f.tar.gz
Reorder some already introduced locking variables.
OpenSolaris onnv revision: 8214:d7abf7c1f1c1 Approved by: pjd, delphij (mentor) Obtained from: OpenSolaris (Bug ID 6747934) MFC after: 3 days
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
index da1e83e..c6655bb 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
@@ -79,6 +79,7 @@ txg_init(dsl_pool_t *dp, uint64_t txg)
rw_init(&tx->tx_suspend, NULL, RW_DEFAULT, NULL);
mutex_init(&tx->tx_sync_lock, NULL, MUTEX_DEFAULT, NULL);
+
cv_init(&tx->tx_sync_more_cv, NULL, CV_DEFAULT, NULL);
cv_init(&tx->tx_sync_done_cv, NULL, CV_DEFAULT, NULL);
cv_init(&tx->tx_quiesce_more_cv, NULL, CV_DEFAULT, NULL);
@@ -99,14 +100,15 @@ txg_fini(dsl_pool_t *dp)
ASSERT(tx->tx_threads == 0);
- cv_destroy(&tx->tx_exit_cv);
- cv_destroy(&tx->tx_quiesce_done_cv);
- cv_destroy(&tx->tx_quiesce_more_cv);
- cv_destroy(&tx->tx_sync_done_cv);
- cv_destroy(&tx->tx_sync_more_cv);
rw_destroy(&tx->tx_suspend);
mutex_destroy(&tx->tx_sync_lock);
+ cv_destroy(&tx->tx_sync_more_cv);
+ cv_destroy(&tx->tx_sync_done_cv);
+ cv_destroy(&tx->tx_quiesce_more_cv);
+ cv_destroy(&tx->tx_quiesce_done_cv);
+ cv_destroy(&tx->tx_exit_cv);
+
for (c = 0; c < max_ncpus; c++) {
int i;
OpenPOWER on IntegriCloud