summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/vdev_file.c
diff options
context:
space:
mode:
authorGeorge Wilson <George.Wilson@delphix.com>2012-01-23 18:15:55 -0800
committerGeorge Wilson <George.Wilson@delphix.com>2012-01-23 18:15:55 -0800
commit4263d13f00c9691fa14620eff82abef795be0693 (patch)
tree073c2d7001e6c89ce7cbfa16b1d1b5383ba3f9d3 /usr/src/uts/common/fs/zfs/vdev_file.c
parent546f41c465408bee9e87d051d2fdb40522350b40 (diff)
downloadillumos-gate-4263d13f00c9691fa14620eff82abef795be0693.tar.gz
1948 zpool list should show more detailed pool information
Reviewed by: Adam Leventhal <ahl@delphix.com> Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed by: Eric Schrock <eric.schrock@delphix.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Albert Lee <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Approved by: Eric Schrock <eric.schrock@delphix.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev_file.c')
-rw-r--r--usr/src/uts/common/fs/zfs/vdev_file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev_file.c b/usr/src/uts/common/fs/zfs/vdev_file.c
index 8c22aa5316..043fa51294 100644
--- a/usr/src/uts/common/fs/zfs/vdev_file.c
+++ b/usr/src/uts/common/fs/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);