diff options
| author | delphij <delphij@FreeBSD.org> | 2014-08-02 03:56:06 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-08-02 03:56:06 +0000 |
| commit | 6a949e106dc93d9fa177f78a454fab1d92b5c5e7 (patch) | |
| tree | 7404e6333ff3ecd4049cbff81119e02d6331e597 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c | |
| parent | 4b7aa9ea8a7bce8b0826c0fb5337074a32500239 (diff) | |
| download | FreeBSD-src-6a949e106dc93d9fa177f78a454fab1d92b5c5e7.zip FreeBSD-src-6a949e106dc93d9fa177f78a454fab1d92b5c5e7.tar.gz | |
MFC r268855: MFV r268848:
Instead of asserting all zio's be properly aligned, only assert
on the logical ones.
Cap uberblocks at 8k, otherwise with ashift=17, there would be
only one uberblock.
This fixes a problem that zdb would trip assert on pools with
ashift >= 0xe (8k).
While there, also change the code so it only attempt to condense
space map unless the uncondensed size consumes greater than
zfs_metaslab_condense_block_threshold blocks.
Illumos issue:
4958 zdb trips assert on pools with ashift >= 0xe
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c index 6a248b3..8dbdc96 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ |
