c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 6495 - Fix mutex leak in dmu_objset_find_dp

Browse Source 
6495 Fix mutex leak in dmu_objset_find_dp
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Albert Lee <trisk@omniti.com>

References:
  https://www.illumos.org/issues/6495
  https://github.com/illumos/illumos-gate/commit/2bad225

Ported-by: Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Chunwei Chen <tuxoko@gmail.com>
This commit is contained in:
Brian Behlendorf 2016-01-26 17:54:45 -08:00
parent b6fcb792ca
commit e56766360b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/dmu_objset.c
View File

@ -1785,6 +1785,7 @@ dmu_objset_find_dp(dsl_pool_t *dp, uint64_t ddobj,
* thread suffices. For now, stay single threaded. * thread suffices. For now, stay single threaded.
*/ */
dmu_objset_find_dp_impl(dcp); dmu_objset_find_dp_impl(dcp);
mutex_destroy(&err_lock);
return (error); return (error);
} }
@ -1796,6 +1797,8 @@ dmu_objset_find_dp(dsl_pool_t *dp, uint64_t ddobj,
INT_MAX, 0); INT_MAX, 0);
if (tq == NULL) { if (tq == NULL) {
kmem_free(dcp, sizeof (*dcp)); kmem_free(dcp, sizeof (*dcp));
mutex_destroy(&err_lock);
return (SET_ERROR(ENOMEM)); return (SET_ERROR(ENOMEM));
} }
dcp->dc_tq = tq; dcp->dc_tq = tq;