diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:04:04 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:04:04 +0000 |
| commit | 99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69 (patch) | |
| tree | 2a7de5a6e401f09e065ff1efd5ac558e05536295 /usr/src/uts/common/sys | |
| parent | 7660e73f5b1e781050d87237f1123324e01f467b (diff) | |
| download | illumos-joyent-99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69.tar.gz | |
Revert "1948 zpool list should show more detailed pool information"
This reverts commit 4263d13f00c9691fa14620eff82abef795be0693.
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/fs/zfs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h index a523201954..baa201d7a5 100644 --- a/usr/src/uts/common/sys/fs/zfs.h +++ b/usr/src/uts/common/sys/fs/zfs.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ @@ -167,7 +167,6 @@ typedef enum { ZPOOL_PROP_ALLOCATED, ZPOOL_PROP_READONLY, ZPOOL_PROP_COMMENT, - ZPOOL_PROP_EXPANDSZ, ZPOOL_NUM_PROPS } zpool_prop_t; @@ -673,7 +672,6 @@ typedef struct vdev_stat { uint64_t vs_space; /* total capacity */ uint64_t vs_dspace; /* deflated capacity */ uint64_t vs_rsize; /* replaceable dev size */ - uint64_t vs_esize; /* expandable dev size */ uint64_t vs_ops[ZIO_TYPES]; /* operation count */ uint64_t vs_bytes[ZIO_TYPES]; /* bytes read/written */ uint64_t vs_read_errors; /* read errors */ @@ -790,8 +788,7 @@ typedef enum zfs_ioc { ZFS_IOC_SPACE_WRITTEN, ZFS_IOC_SPACE_SNAPS, ZFS_IOC_DESTROY_SNAPS_NVL, - ZFS_IOC_POOL_REGUID, - ZFS_IOC_POOL_REOPEN + ZFS_IOC_POOL_REGUID } zfs_ioc_t; /* |