diff options
| author | Chris Siden <[email protected]> | 2012-01-23 18:43:32 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-09-19 13:39:05 -0700 |
| commit | 1bd201e70d57464fd26bf9089ea4b44fd49e4f2d (patch) | |
| tree | f6789c1bbdfc94b8a8220df2cd23a93305e4b459 /module/zfs/vdev_file.c | |
| parent | 95fd8c9a7f979e4c4941d329e6457cc84a81edfa (diff) | |
Illumos #1948: zpool list should show more detailed pool info
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: Eric Schrock <[email protected]>
Reviewed by: Richard Lowe <[email protected]>
Reviewed by: Albert Lee <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Garrett D'Amore <[email protected]>
Approved by: Eric Schrock <[email protected]>
References:
https://www.illumos.org/issues/1948
Ported by: Martin Matuska <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #685
Diffstat (limited to 'module/zfs/vdev_file.c')
| -rw-r--r-- | module/zfs/vdev_file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/module/zfs/vdev_file.c b/module/zfs/vdev_file.c index 25d0bad3f..3c0ce53cd 100644 --- a/module/zfs/vdev_file.c +++ b/module/zfs/vdev_file.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -47,7 +48,8 @@ vdev_file_rele(vdev_t *vd) } static int -vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *ashift) +vdev_file_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize, + uint64_t *ashift) { vdev_file_t *vf; vnode_t *vp; @@ -112,7 +114,7 @@ skip_open: return (error); } - *psize = vattr.va_size; + *max_psize = *psize = vattr.va_size; *ashift = SPA_MINBLOCKSHIFT; return (0); |