From 9635861742c6ac334877f944e17948aa11c2e57a Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Sat, 13 Sep 2014 15:40:05 +0200 Subject: 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 Reviewed by: George Wilson Reviewed by: Saso Kiselkov Approved by: Dan McDonald 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 Signed-off-by: Brian Behlendorf Closes #2697 --- cmd/ztest/ztest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/ztest') 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; -- cgit v1.2.3