diff options
author | Matthew Ahrens <[email protected]> | 2014-09-13 15:40:05 +0200 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2014-10-23 15:30:32 -0700 |
commit | 9635861742c6ac334877f944e17948aa11c2e57a (patch) | |
tree | 2fe4744c568f26163707363d6c6c3cb22eb627ae /cmd/ztest/ztest.c | |
parent | b02fe35d3743c92e26f4158938e94093a2309a92 (diff) |
Illumos 5164-5165 - space map fixes
5164 space_map_max_blksz causes panic, does not work
5165 zdb fails assertion when run on pool with recently-enabled
space map_histogram feature
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Saso Kiselkov <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/5164
https://www.illumos.org/issues/5165
https://github.com/illumos/illumos-gate/commit/b1be289
Porting Notes:
The metaslab_fragmentation() hunk was dropped from this patch
because it was already resolved by commit 8b0a084.
The comment modified in metaslab.c was updated to use the correct
variable name, space_map_blksz. The upstream commit incorrectly
used space_map_blksize.
Ported by: Turbo Fredriksson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2697
Diffstat (limited to 'cmd/ztest/ztest.c')
-rw-r--r-- | cmd/ztest/ztest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 0967717fb..b6f2e234b 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1025,7 +1025,7 @@ ztest_random_spa_version(uint64_t initial_version) * Find the largest ashift used */ static uint64_t -ztest_spa_get_ashift() { +ztest_spa_get_ashift(void) { uint64_t i; uint64_t ashift = SPA_MINBLOCKSHIFT; vdev_t *rvd = ztest_spa->spa_root_vdev; |