The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd1e7a8caac9129cc08995f8ff81a0eef0529bc
commit bcd1e7a8caac9129cc08995f8ff81a0eef0529bc Author: John Baldwin <[email protected]> AuthorDate: 2026-09-14 15:33:12 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2026-09-14 15:33:12 +0000 rangelock: Enable rl_q_owner tracking under INVARIANT_SUPPORT This fixes the build for kernels with INVARIANT_SUPPORT but without INVARIANTS. Fixes: 2e376cca379b ("rangelock: Reimplement _rangelock_cookie_assert()") --- sys/kern/kern_rangelock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c index 659f055507f6..92b1b52fd632 100644 --- a/sys/kern/kern_rangelock.c +++ b/sys/kern/kern_rangelock.c @@ -288,7 +288,7 @@ struct rl_q_entry { struct rl_q_entry *rl_q_free; off_t rl_q_start, rl_q_end; int rl_q_flags; -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT struct thread *rl_q_owner; #endif }; @@ -320,7 +320,7 @@ rlqentry_alloc(vm_ooffset_t start, vm_ooffset_t end, int flags) e->rl_q_start = start; e->rl_q_end = end; e->rl_q_flags = flags; -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT e->rl_q_owner = curthread; #endif return (e); @@ -497,7 +497,7 @@ again: if (rl_e_is_marked(next)) { next = rl_e_unmark(next); if (rl_q_cas(prev, cur, next)) { -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT cur->rl_q_owner = NULL; #endif cur->rl_q_free = free; @@ -669,7 +669,7 @@ again: if (rl_e_is_marked(next)) { next = rl_e_unmark(next); if (rl_q_cas(prev, cur, next)) { -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT cur->rl_q_owner = NULL; #endif cur->rl_q_free = *free; @@ -898,7 +898,7 @@ DB_SHOW_COMMAND(rangelock, db_show_rangelock) "flags %x next %p", e, rl_e_is_marked(e), rl_e_is_marked(x->rl_q_next), x->rl_q_start, x->rl_q_end, x->rl_q_flags, x->rl_q_next); -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT db_printf(" owner %p (%d)", x->rl_q_owner, x->rl_q_owner != NULL ? x->rl_q_owner->td_tid : -1); #endif
