From 7d4fe54632d743ffc919d4793d3272d66f73ca55 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 15 Jan 2009 16:22:23 -0800 Subject: [PATCH 1/2] txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions --- module/zfs/txg.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 7a24678cb7..e3c0e2a134 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -67,7 +67,6 @@ txg_init(dsl_pool_t *dp, uint64_t txg) cv_init(&tx->tx_sync_done_cv, NULL, CV_DEFAULT, NULL); cv_init(&tx->tx_quiesce_more_cv, NULL, CV_DEFAULT, NULL); cv_init(&tx->tx_quiesce_done_cv, NULL, CV_DEFAULT, NULL); - cv_init(&tx->tx_timeout_cv, NULL, CV_DEFAULT, NULL); cv_init(&tx->tx_exit_cv, NULL, CV_DEFAULT, NULL); tx->tx_open_txg = txg; @@ -84,13 +83,6 @@ txg_fini(dsl_pool_t *dp) ASSERT(tx->tx_threads == 0); - 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_timeout_cv); - cv_destroy(&tx->tx_exit_cv); - rw_destroy(&tx->tx_suspend); mutex_destroy(&tx->tx_sync_lock); From 50186c2b57b689d0e3c0dc7f204f66e4c5fa9b71 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 15 Jan 2009 16:25:25 -0800 Subject: [PATCH 2/2] All init and destroy initialized pulled in --- module/zfs/space_map.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/zfs/space_map.c b/module/zfs/space_map.c index 4352e5bb3f..1cdacc81da 100644 --- a/module/zfs/space_map.c +++ b/module/zfs/space_map.c @@ -63,8 +63,6 @@ space_map_create(space_map_t *sm, uint64_t start, uint64_t size, uint8_t shift, avl_create(&sm->sm_root, space_map_seg_compare, sizeof (space_seg_t), offsetof(struct space_seg, ss_node)); - cv_init(&sm->sm_load_cv, NULL, CV_DEFAULT, NULL); - sm->sm_start = start; sm->sm_size = size; sm->sm_shift = shift; @@ -76,7 +74,6 @@ space_map_destroy(space_map_t *sm) { ASSERT(!sm->sm_loaded && !sm->sm_loading); VERIFY3U(sm->sm_space, ==, 0); - cv_destroy(&sm->sm_load_cv); avl_destroy(&sm->sm_root); cv_destroy(&sm->sm_load_cv); }