diff options
| author | delphij <delphij@FreeBSD.org> | 2014-08-10 05:58:41 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-08-10 05:58:41 +0000 |
| commit | c14fd95fbce4723cad57b71f8e79384531937540 (patch) | |
| tree | d685c6db2bb9a4d6c9e7e85215db5e682b38276d /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c | |
| parent | 33ac232e589b350c7979e97a5f080b8939dcc19f (diff) | |
| download | FreeBSD-src-c14fd95fbce4723cad57b71f8e79384531937540.zip FreeBSD-src-c14fd95fbce4723cad57b71f8e79384531937540.tar.gz | |
MFC r269118: 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
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c index 629870b..d158b24 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c @@ -202,10 +202,10 @@ space_map_histogram_add(space_map_t *sm, range_tree_t *rt, dmu_tx_t *tx) * reached the maximum bucket size. Accumulate all ranges * larger than the max bucket size into the last bucket. */ - if (idx < SPACE_MAP_HISTOGRAM_SIZE(sm) - 1) { + if (idx < SPACE_MAP_HISTOGRAM_SIZE - 1) { ASSERT3U(idx + sm->sm_shift, ==, i); idx++; - ASSERT3U(idx, <, SPACE_MAP_HISTOGRAM_SIZE(sm)); + ASSERT3U(idx, <, SPACE_MAP_HISTOGRAM_SIZE); } } } |
