diff options
author | smh <smh@FreeBSD.org> | 2015-11-05 17:19:08 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2015-11-05 17:19:08 +0000 |
commit | b24eb35d36c87cba1bef78e751142aa7d680b33e (patch) | |
tree | 8e27e3fd0b991fdb0381f172d6afef2787233f30 /sys/cddl | |
parent | 4466ac4374e33317e23e2eab41170759eec544e4 (diff) | |
download | FreeBSD-src-b24eb35d36c87cba1bef78e751142aa7d680b33e.zip FreeBSD-src-b24eb35d36c87cba1bef78e751142aa7d680b33e.tar.gz |
MFC r276450
Correct zpool list displaying invalid EXPANDSZ for unavailable pool vdevs
Sponsored by: Multiplay
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c index 24d4744..06824f7 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c @@ -2808,7 +2808,8 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t *vs) vs->vs_rsize = vdev_get_min_asize(vd); if (vd->vdev_ops->vdev_op_leaf) vs->vs_rsize += VDEV_LABEL_START_SIZE + VDEV_LABEL_END_SIZE; - vs->vs_esize = vd->vdev_max_asize - vd->vdev_asize; + if (vd->vdev_max_asize != 0) + vs->vs_esize = vd->vdev_max_asize - vd->vdev_asize; vs->vs_configured_ashift = vd->vdev_top != NULL ? vd->vdev_top->vdev_ashift : vd->vdev_ashift; vs->vs_logical_ashift = vd->vdev_logical_ashift; |