diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2016-12-01 15:13:18 +0100 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2016-12-20 11:38:45 +0100 |
| commit | cead1df3b072a636f2f644cb38b83059f9f01fe8 (patch) | |
| tree | 071e817369f348879e4a97793b5acb79d9e10459 /usr | |
| parent | d3147737fcad3bbe69cbd5b065363137f4e61c52 (diff) | |
| download | illumos-joyent-cead1df3b072a636f2f644cb38b83059f9f01fe8.tar.gz | |
7662 assertion triggered in syseventd zfs_mod.so
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c b/usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c index dae69d1945..e98ee0c9b7 100644 --- a/usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c +++ b/usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. - * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. All rights reserved. */ /* @@ -822,6 +822,7 @@ slm_fini() { unavailpool_t *pool; + (void) thr_join(g_zfs_tid, NULL, NULL); if (g_tpool != NULL) { tpool_wait(g_tpool); tpool_destroy(g_tpool); @@ -831,7 +832,6 @@ slm_fini() zpool_close(pool->uap_zhp); free(pool); } - (void) thr_join(g_zfs_tid, NULL, NULL); list_destroy(&g_pool_list); libzfs_fini(g_zfshdl); } |