diff options
author | Jorgen Lundman <lundman@lundman.net> | 2015-04-02 00:49:14 +1100 |
---|---|---|
committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2015-04-28 16:23:38 -0700 |
commit | 58c4aa00c65e09f254de0b939b2c1aa720c204a1 (patch) | |
tree | add79d708eb8b3dd10f062d8c9231fd2d249d21e /module/zfs/sa.c | |
parent | ca227e54a89e0797ca99063a326f01633267a44a (diff) |
Illumos 4975 - missing mutex_destroy() calls in zfs
4975 missing mutex_destroy() calls in zfs
Author: Jorgen Lundman <lundman@lundman.net>
Reviewed by: Matthew Ahrens <matthew.ahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Reviewed by: Seth Nimbosa <darth.Serious@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Don Brady <dev.fs.zfs@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
References:
https://www.illumos.org/issues/4975
https://github.com/illumos/illumos-gate/commit/d2b3cbb
Ported-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Diffstat (limited to 'module/zfs/sa.c')
-rw-r--r-- | module/zfs/sa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/module/zfs/sa.c b/module/zfs/sa.c index 9063d1dae..7b6c7177d 100644 --- a/module/zfs/sa.c +++ b/module/zfs/sa.c @@ -1112,6 +1112,9 @@ fail: 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); } @@ -1148,6 +1151,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; |