MFV r268702:
Add missing *_destroy() calls in various places with ZFS. Illumos issue: 4975 missing mutex_destroy() calls in zfs MFC after: 2 weeks
This commit is contained in:
commit
eb75155228
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=268713
@ -1353,6 +1353,12 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
|
||||
if (dr->dt.dl.dr_data != db->db_buf)
|
||||
VERIFY(arc_buf_remove_ref(dr->dt.dl.dr_data, db));
|
||||
}
|
||||
|
||||
if (db->db_level != 0) {
|
||||
mutex_destroy(&dr->dt.di.dr_mtx);
|
||||
list_destroy(&dr->dt.di.dr_children);
|
||||
}
|
||||
|
||||
kmem_free(dr, sizeof (dbuf_dirty_record_t));
|
||||
|
||||
ASSERT(db->db_dirtycnt > 0);
|
||||
|
@ -1083,6 +1083,11 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag,
|
||||
}
|
||||
if (winner = dmu_buf_set_user(&db->db, children_dnodes, NULL,
|
||||
dnode_buf_pageout)) {
|
||||
|
||||
for (i = 0; i < epb; i++) {
|
||||
zrl_destroy(&dnh[i].dnh_zrlock);
|
||||
}
|
||||
|
||||
kmem_free(children_dnodes, sizeof (dnode_children_t) +
|
||||
(epb - 1) * sizeof (dnode_handle_t));
|
||||
children_dnodes = winner;
|
||||
|
@ -476,8 +476,8 @@ dnode_undirty_dbufs(list_t *list)
|
||||
dr->dt.dl.dr_data == db->db_buf);
|
||||
dbuf_unoverride(dr);
|
||||
} else {
|
||||
list_destroy(&dr->dt.di.dr_children);
|
||||
mutex_destroy(&dr->dt.di.dr_mtx);
|
||||
list_destroy(&dr->dt.di.dr_children);
|
||||
}
|
||||
kmem_free(dr, sizeof (dbuf_dirty_record_t));
|
||||
dbuf_rele_and_unlock(db, (void *)(uintptr_t)txg);
|
||||
|
@ -270,6 +270,7 @@ dsl_dataset_evict(dmu_buf_t *db, void *dsv)
|
||||
if (mutex_owned(&ds->ds_opening_lock))
|
||||
mutex_exit(&ds->ds_opening_lock);
|
||||
mutex_destroy(&ds->ds_opening_lock);
|
||||
mutex_destroy(&ds->ds_sendstream_lock);
|
||||
refcount_destroy(&ds->ds_longholds);
|
||||
|
||||
kmem_free(ds, sizeof (dsl_dataset_t));
|
||||
@ -398,6 +399,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
|
||||
if (err != 0) {
|
||||
mutex_destroy(&ds->ds_lock);
|
||||
mutex_destroy(&ds->ds_opening_lock);
|
||||
mutex_destroy(&ds->ds_sendstream_lock);
|
||||
refcount_destroy(&ds->ds_longholds);
|
||||
bplist_destroy(&ds->ds_pending_deadlist);
|
||||
dsl_deadlist_close(&ds->ds_deadlist);
|
||||
@ -454,6 +456,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
|
||||
dsl_dir_rele(ds->ds_dir, ds);
|
||||
mutex_destroy(&ds->ds_lock);
|
||||
mutex_destroy(&ds->ds_opening_lock);
|
||||
mutex_destroy(&ds->ds_sendstream_lock);
|
||||
refcount_destroy(&ds->ds_longholds);
|
||||
kmem_free(ds, sizeof (dsl_dataset_t));
|
||||
if (err != 0) {
|
||||
|
@ -1111,6 +1111,9 @@ sa_setup(objset_t *os, uint64_t sa_obj, sa_attr_reg_t *reg_attrs, int count,
|
||||
if (sa->sa_user_table)
|
||||
kmem_free(sa->sa_user_table, sa->sa_user_table_sz);
|
||||
mutex_exit(&sa->sa_lock);
|
||||
avl_destroy(&sa->sa_layout_hash_tree);
|
||||
avl_destroy(&sa->sa_layout_num_tree);
|
||||
mutex_destroy(&sa->sa_lock);
|
||||
kmem_free(sa, sizeof (sa_os_t));
|
||||
return ((error == ECKSUM) ? EIO : error);
|
||||
}
|
||||
@ -1146,6 +1149,7 @@ sa_tear_down(objset_t *os)
|
||||
|
||||
avl_destroy(&sa->sa_layout_hash_tree);
|
||||
avl_destroy(&sa->sa_layout_num_tree);
|
||||
mutex_destroy(&sa->sa_lock);
|
||||
|
||||
kmem_free(sa, sizeof (sa_os_t));
|
||||
os->os_sa = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user