diff options
| -rw-r--r-- | cmd/ztest.c | 1 | ||||
| -rw-r--r-- | module/zfs/spa_log_spacemap.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/ztest.c b/cmd/ztest.c index 19edab4eb..1c7c74c5d 100644 --- a/cmd/ztest.c +++ b/cmd/ztest.c @@ -2177,6 +2177,7 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) * but not always, because we also want to verify correct * behavior when the data was not recently read into cache. */ + ASSERT(doi.doi_data_block_size); ASSERT0(offset % doi.doi_data_block_size); if (ztest_random(4) != 0) { int prefetch = ztest_random(2) ? diff --git a/module/zfs/spa_log_spacemap.c b/module/zfs/spa_log_spacemap.c index c7ba5f65a..2878e68c6 100644 --- a/module/zfs/spa_log_spacemap.c +++ b/module/zfs/spa_log_spacemap.c @@ -691,7 +691,8 @@ spa_estimate_metaslabs_to_flush(spa_t *spa) * based on the incoming rate until we exceed it. */ if (available_blocks >= 0 && available_txgs >= 0) { - uint64_t skip_txgs = MIN(available_txgs + 1, + uint64_t skip_txgs = (incoming == 0) ? + available_txgs + 1 : MIN(available_txgs + 1, (available_blocks / incoming) + 1); available_blocks -= (skip_txgs * incoming); available_txgs -= skip_txgs; |