summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorTim Haley <Tim.Haley@Sun.COM>2009-05-08 14:20:37 -0600
committerTim Haley <Tim.Haley@Sun.COM>2009-05-08 14:20:37 -0600
commit8b33d774c03f9e486579a2665839f9833a9d90bc (patch)
tree3576f31f6b1a26809c6e7d4960e36d35f783e0f5 /usr/src
parente99353559fac68ede91471daee91660d64cc7894 (diff)
downloadillumos-joyent-8b33d774c03f9e486579a2665839f9833a9d90bc.tar.gz
6794136 Panic BAD TRAP: type=e when importing degraded zraid pool.
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/fs/zfs/vdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 087ec43f34..e0e9cca988 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -2589,8 +2589,8 @@ vdev_set_state(vdev_t *vd, boolean_t isopen, vdev_state_t state, vdev_aux_t aux)
vd->vdev_removed = B_FALSE;
}
- if (!isopen)
- vdev_propagate_state(vd);
+ if (!isopen && vd->vdev_parent)
+ vdev_propagate_state(vd->vdev_parent);
}
/*