From: Alessio Podda <alessio@isc.org>
Date: Mon, 3 Aug 2026 15:07:54 +0000 (+0200)
Subject: Pad struct hole with rarely used fields
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92d89439e146b2a3fea91ee20fd584e9ce436eed;p=thirdparty%2Fbind9.git

Pad struct hole with rarely used fields

The alignment we added to the zone reference and the zone lock
increases the size of dns_zone_t. Compensate for it by moving
some cold fields in the hole left by alignment.
---

diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h
index bf0a8c0255a..90768fcdc43 100644
--- a/lib/dns/zone_p.h
+++ b/lib/dns/zone_p.h
@@ -370,6 +370,10 @@ struct dns_zone {
 	isc_mem_t *mctx;
 	__attribute__((
 		aligned(ISC_OS_CACHELINE_SIZE))) isc_refcount_t references;
+	char *masterfile;
+	char *initfile;
+	const FILE *stream;		  /* loading from a stream? */
+	ISC_LIST(dns_include_t) includes; /* Include files */
 
 	__attribute__((aligned(ISC_OS_CACHELINE_SIZE))) isc_rwlock_t dblock;
 	dns_db_t *db; /* Locked by dblock */
@@ -383,10 +387,6 @@ struct dns_zone {
 	isc_refcount_t irefs;
 	dns_name_t origin;
 	dns_rad_t *rad;
-	char *masterfile;
-	char *initfile;
-	const FILE *stream;		     /* loading from a stream? */
-	ISC_LIST(dns_include_t) includes;    /* Include files */
 	ISC_LIST(dns_include_t) newincludes; /* Loading */
 	unsigned int nincludes;
 	dns_masterformat_t masterformat;