summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authornordmark <none@none>2008-01-22 15:57:26 -0800
committernordmark <none@none>2008-01-22 15:57:26 -0800
commitbd41d0a82bd89bc81d63ae5dfc2ba4245f74ea6c (patch)
tree34d74b100f909c973299a5ded0d0a231ac2d069e /usr/src/lib
parentc63537d6ab9d03a6ce330b36e829aba258c25d87 (diff)
downloadillumos-joyent-bd41d0a82bd89bc81d63ae5dfc2ba4245f74ea6c.tar.gz
6558857 ZSD callback locking cause deadlocks
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libzonecfg/common/libzonecfg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/lib/libzonecfg/common/libzonecfg.c b/usr/src/lib/libzonecfg/common/libzonecfg.c
index 94644741dd..2bce66d3f5 100644
--- a/usr/src/lib/libzonecfg/common/libzonecfg.c
+++ b/usr/src/lib/libzonecfg/common/libzonecfg.c
@@ -5107,6 +5107,8 @@ kernel_state_to_user_state(zoneid_t zoneid, zone_status_t kernel_state)
assert(kernel_state <= ZONE_MAX_STATE);
switch (kernel_state) {
case ZONE_IS_UNINITIALIZED:
+ case ZONE_IS_INITIALIZED:
+ /* The kernel will not return these two states */
return (ZONE_STATE_READY);
case ZONE_IS_READY:
/*