Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent

This commit is contained in:
Brian Behlendorf 2009-01-15 16:31:37 -08:00
parent 4eae633e62 fb256294c9
commit 9ecb40af61
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/space_map.c
View File

@ -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, avl_create(&sm->sm_root, space_map_seg_compare,
sizeof (space_seg_t), offsetof(struct space_seg, ss_node)); 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_start = start;
sm->sm_size = size; sm->sm_size = size;
sm->sm_shift = shift; sm->sm_shift = shift;
@ -76,7 +74,6 @@ space_map_destroy(space_map_t *sm)
{ {
ASSERT(!sm->sm_loaded && !sm->sm_loading); ASSERT(!sm->sm_loaded && !sm->sm_loading);
VERIFY3U(sm->sm_space, ==, 0); VERIFY3U(sm->sm_space, ==, 0);
cv_destroy(&sm->sm_load_cv);
avl_destroy(&sm->sm_root); avl_destroy(&sm->sm_root);
cv_destroy(&sm->sm_load_cv); cv_destroy(&sm->sm_load_cv);
} }

8
module/zfs/txg.c
View File

@ -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_sync_done_cv, NULL, CV_DEFAULT, NULL);
cv_init(&tx->tx_quiesce_more_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_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); cv_init(&tx->tx_exit_cv, NULL, CV_DEFAULT, NULL);
tx->tx_open_txg = txg; tx->tx_open_txg = txg;
@ -84,13 +83,6 @@ txg_fini(dsl_pool_t *dp)
ASSERT(tx->tx_threads == 0); 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); rw_destroy(&tx->tx_suspend);
mutex_destroy(&tx->tx_sync_lock); mutex_destroy(&tx->tx_sync_lock);