diff options
| author | mm <mm@FreeBSD.org> | 2012-05-27 16:00:00 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-05-27 16:00:00 +0000 |
| commit | 38ef930079cbb1df5de9df3c1064426dba3976b1 (patch) | |
| tree | 30fa7a955d657db9e029a43bcefda627cc7a28c8 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | |
| parent | a672aabea920d34e84bd86ff013aa294bf6a5f7b (diff) | |
| download | FreeBSD-src-38ef930079cbb1df5de9df3c1064426dba3976b1.zip FreeBSD-src-38ef930079cbb1df5de9df3c1064426dba3976b1.tar.gz | |
Import illumos changeset 13570:3411fd5f1589
1948 zpool list should show more detailed pool information
Display per-vdev information with "zpool list -v".
The added expandsize property has currently no value on FreeBSD.
This changeset allows adding expansion support to individual vdevs
in the future.
References:
https://www.illumos.org/issues/1948
Obtained from: illumos (issue #1948)
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 47c7b4a..b2aada7 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -21,6 +21,8 @@ /* * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. + * + * Portions Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org> */ #include <sys/zfs_context.h> @@ -405,7 +407,8 @@ vdev_geom_open_by_path(vdev_t *vd, int check_guid) } static int -vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *ashift) +vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize, + uint64_t *ashift) { struct g_provider *pp; struct g_consumer *cp; @@ -488,7 +491,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *ashift) /* * Determine the actual size of the device. */ - *psize = pp->mediasize; + *max_psize = *psize = pp->mediasize; /* * Determine the device's minimum transfer size. |
