Date: Thu, 5 Nov 2015 17:19:08 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r290402 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201511051719.tA5HJ8Q7062828@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Thu Nov 5 17:19:08 2015 New Revision: 290402 URL: https://svnweb.freebsd.org/changeset/base/290402 Log: MFC r276450 Correct zpool list displaying invalid EXPANDSZ for unavailable pool vdevs Sponsored by: Multiplay Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Thu Nov 5 17:12:41 2015 (r290401) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Thu Nov 5 17:19:08 2015 (r290402) @@ -2808,7 +2808,8 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t * 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511051719.tA5HJ8Q7062828>