From efe106650e8da7504b3aa3188875e9c7e06b2826 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Thu, 9 Nov 2023 15:42:34 -0500 Subject: [PATCH] u3: moves u3a_ream (free-list adjustment) into v3 migration --- pkg/noun/manage.c | 4 ---- pkg/noun/v3/allocate.h | 1 + pkg/noun/v3/manage.c | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c index fde676b463..2de555d58c 100644 --- a/pkg/noun/manage.c +++ b/pkg/noun/manage.c @@ -652,10 +652,6 @@ _find_home(void) } } - // XX move me - // - u3a_ream(); - /* As a further guard against any sneaky loom corruption */ u3a_loom_sane(); diff --git a/pkg/noun/v3/allocate.h b/pkg/noun/v3/allocate.h index bacc79e174..83db4a51b9 100644 --- a/pkg/noun/v3/allocate.h +++ b/pkg/noun/v3/allocate.h @@ -11,6 +11,7 @@ # define u3R_v3 u3a_Road # define u3a_v3_balign u3a_balign # define u3a_v3_road u3a_road +# define u3a_v3_ream u3a_ream # define u3a_v3_walign u3a_walign # define u3a_v3_walloc u3a_walloc diff --git a/pkg/noun/v3/manage.c b/pkg/noun/v3/manage.c index a15d5ad9be..9eb8a96cdb 100644 --- a/pkg/noun/v3/manage.c +++ b/pkg/noun/v3/manage.c @@ -100,6 +100,9 @@ u3m_v3_migrate() u3R_v3 = &u3H_v3->rod_u; u3H_v3->ver_w = U3V_VER3; + // recalculate free lists + u3a_v3_ream(); + // initialize persistent cache u3R_v3->cax.per_p = u3h_v3_new_cache(u3C.per_w);