From 53f119e71c94c96efc4729766b0f07e3b3775445 Mon Sep 17 00:00:00 2001 From: Shawn Webb Date: Tue, 31 May 2022 16:59:24 -0400 Subject: [PATCH] HBSD: Pull in proposed OpenZFS change FreeBSD's amotine@ opened a pull request[0] with the patch in this commit. This commit pulls in that GitHub PR. [0]: https://github.com/openzfs/zfs/pull/13513 Signed-off-by: Shawn Webb --- sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/spa_log_spacemap.c b/sys/contrib/openzfs/module/zfs/spa_log_spacemap.c index f831509a42474..c5a1039bd838e 100644 --- a/sys/contrib/openzfs/module/zfs/spa_log_spacemap.c +++ b/sys/contrib/openzfs/module/zfs/spa_log_spacemap.c @@ -511,12 +511,6 @@ spa_log_summary_decrement_blkcount(spa_t *spa, uint64_t blocks_gone) e->lse_txgcount--; for (; e != NULL; e = list_head(&spa->spa_log_summary)) { if (e->lse_blkcount > blocks_gone) { - /* - * Assert that we stopped at an entry that is not - * obsolete. - */ - ASSERT(e->lse_mscount != 0); - e->lse_blkcount -= blocks_gone; blocks_gone = 0; break;