summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2014-05-14 18:55:26 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2014-05-14 18:55:26 +0000
commit4cb09b44b4f851905a0e8cccbd9bfc834acc2041 (patch)
treefaffd98af89659d14f1f0ffa1f16e3f1dc84bb37
parent984a243eb4be95d350960b939c145d03a33b290d (diff)
downloadillumos-joyent-4cb09b44b4f851905a0e8cccbd9bfc834acc2041.tar.gz
OS-2943 zone stuck 'down': references still extant
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_zone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_zone.c b/usr/src/uts/common/fs/zfs/zfs_zone.c
index 503416b293..96f8fbaef6 100644
--- a/usr/src/uts/common/fs/zfs/zfs_zone.c
+++ b/usr/src/uts/common/fs/zfs/zfs_zone.c
@@ -10,7 +10,7 @@
*/
/*
- * Copyright 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2014, Joyent, Inc. All rights reserved.
*/
/*
@@ -1152,10 +1152,10 @@ zfs_zone_zio_done(zio_t *zp)
if (zp->io_type == ZIO_TYPE_IOCTL)
return;
- if ((zonep = zone_find_by_id(zp->io_zoneid)) == NULL)
+ if (zp->io_dispatched == 0)
return;
- if (zp->io_dispatched == 0)
+ if ((zonep = zone_find_by_id(zp->io_zoneid)) == NULL)
return;
now = gethrtime();