From 193e01ab2093740f3d205f132f745f5c245cead8 Mon Sep 17 00:00:00 2001 From: Colin Vidal Date: Fri, 10 Apr 2026 08:57:51 +0200 Subject: [PATCH] Remove hiwater/lowater fields from delegdb The delegdb does not directly use the hiwater and lowater values during the cleaning flow, so these fields are no longer necessary. --- lib/dns/deleg.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/dns/deleg.c b/lib/dns/deleg.c index ae03ed1dda..151d7fe8ba 100644 --- a/lib/dns/deleg.c +++ b/lib/dns/deleg.c @@ -68,9 +68,6 @@ struct dns_delegdb { * (After decrementing `owners`.) */ isc_refcount_t owners; - - size_t lowater; - size_t hiwater; }; static void @@ -976,16 +973,19 @@ dns_delegdb_shutdown(dns_delegdb_t *delegdb) { void dns_delegdb_setsize(dns_delegdb_t *delegdb, size_t size) { + size_t lowater; + size_t hiwater; + REQUIRE(VALID_DELEGDB(delegdb)); if (size != 0 && size < DELEGDB_MINSIZE) { size = DELEGDB_MINSIZE; } - delegdb->hiwater = size - (size >> 3); /* Approximately 7/8ths. */ - delegdb->lowater = size - (size >> 2); /* Approximately 3/4ths. */ + hiwater = size - (size >> 3); /* Approximately 7/8ths. */ + lowater = size - (size >> 2); /* Approximately 3/4ths. */ - if (size == 0 || delegdb->hiwater == 0 || delegdb->lowater == 0) { + if (size == 0 || hiwater == 0 || lowater == 0) { isc_mem_clearwater(delegdb->mctx); /* @@ -993,7 +993,6 @@ dns_delegdb_setsize(dns_delegdb_t *delegdb, size_t size) { * implicit overmem bypass, so the user should be warned... */ } else { - isc_mem_setwater(delegdb->mctx, delegdb->hiwater, - delegdb->lowater); + isc_mem_setwater(delegdb->mctx, hiwater, lowater); } }