diff options
| author | delphij <delphij@FreeBSD.org> | 2014-07-26 10:20:48 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-07-26 10:20:48 +0000 |
| commit | 0f4faf42cbb855fd26557197bdcea66a237af96c (patch) | |
| tree | 5cafe8ee4c6165148ca59e000281c72b1f70ed51 /sys/cddl/contrib/opensolaris/common | |
| parent | 381cd3e0c871457c04eae714342736bdacf9db0e (diff) | |
| download | FreeBSD-src-0f4faf42cbb855fd26557197bdcea66a237af96c.zip FreeBSD-src-0f4faf42cbb855fd26557197bdcea66a237af96c.tar.gz | |
MFV r269010:
Import Illumos changes to address the following Illumos issues:
4976 zfs should only avoid writing to a failing non-redundant
top-level vdev
4978 ztest fails in get_metaslab_refcount()
4979 extend free space histogram to device and pool
4980 metaslabs should have a fragmentation metric
4981 remove fragmented ops vector from block allocator
4982 space_map object should proactively upgrade when feature
is enabled
4984 device selection should use fragmentation metric
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c index 51041a8..a400f82 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ #include <sys/zio.h> @@ -87,6 +87,8 @@ zpool_prop_init(void) PROP_READONLY, ZFS_TYPE_POOL, "<size>", "ALLOC"); zprop_register_number(ZPOOL_PROP_EXPANDSZ, "expandsize", 0, PROP_READONLY, ZFS_TYPE_POOL, "<size>", "EXPANDSZ"); + zprop_register_number(ZPOOL_PROP_FRAGMENTATION, "fragmentation", 0, + PROP_READONLY, ZFS_TYPE_POOL, "<percent>", "FRAG"); zprop_register_number(ZPOOL_PROP_CAPACITY, "capacity", 0, PROP_READONLY, ZFS_TYPE_POOL, "<size>", "CAP"); zprop_register_number(ZPOOL_PROP_GUID, "guid", 0, PROP_READONLY, |
