diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-06-22 11:42:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-06-22 11:42:56 +0000 |
| commit | 5fc1cc1539eb55fc94861c90df9babcc18da6a6a (patch) | |
| tree | 0eda51f9e480c416a984eaa3dc5eec018fc9f1a6 /usr/src/lib | |
| parent | 23dc8cdf267c3735334b46403e566f07540a62db (diff) | |
| parent | 1d3f896f5469c69c1339890ec3d68e9feddb0343 (diff) | |
| download | illumos-joyent-5fc1cc1539eb55fc94861c90df9babcc18da6a6a.tar.gz | |
[illumos-gate merge]
commit 1d3f896f5469c69c1339890ec3d68e9feddb0343
5981 Deadlock in dmu_objset_find_dp
commit 6203546182f592d62b0fb7f4182da3d21d59031f
3768 fnmatch(5) is worded poorly
commit 2750f8d5ec1b891560ac2224f6c37243d910bd1b
5997 FRU field not set during pool creation and never updated
commit 057c620a8f2b46f09e91dfff7da884175a36b0a8
5996 libtopo ses module unload takes too long
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/ses/ses.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/lib/fm/topo/modules/common/ses/ses.c b/usr/src/lib/fm/topo/modules/common/ses/ses.c index d8d7b5e24b..835c6e7b9a 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/ses.c +++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ #include <alloca.h> @@ -452,12 +453,15 @@ ses_contract_thread(void *arg) ctid_t ctid; struct pollfd fds; int pollret; + sigset_t sigset; ses_ct_print("start contract event thread"); efd = open64(CTFS_ROOT "/device/pbundle", O_RDONLY); fds.fd = efd; fds.events = POLLIN; fds.revents = 0; + sigaddset(&sigset, sesthread.thr_sig); + pthread_sigmask(SIG_UNBLOCK, &sigset, NULL); for (;;) { /* check if we've been asked to exit */ (void) pthread_mutex_lock(&sesthread.mt); |