The branch main has been updated by olce:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1e78a6a6d85702b84f679712aac71f91e481e8f9

commit 1e78a6a6d85702b84f679712aac71f91e481e8f9
Author:     Olivier Certner <o...@freebsd.org>
AuthorDate: 2025-07-07 14:14:16 +0000
Commit:     Olivier Certner <o...@freebsd.org>
CommitDate: 2025-07-13 07:15:22 +0000

    vm_domainset: Print correct function in KASSERT()/panic()
    
    Some messages in vm_domainset_iter_next() would wrongly refer to
    vm_domainset_iter_first().  While here, ensure that all assertion/panic
    messages use '__func__' to avoid this discrepancy in the future if code
    is moved/copy-pasted again.
    
    Reviewed by:    markj, alc, kib
    MFC after:      10 days
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D51248
---
 sys/vm/vm_domainset.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c
index 7b8bf4c77663..b44bdb96b0d4 100644
--- a/sys/vm/vm_domainset.c
+++ b/sys/vm/vm_domainset.c
@@ -131,8 +131,7 @@ static void
 vm_domainset_iter_next(struct vm_domainset_iter *di, int *domain)
 {
 
-       KASSERT(di->di_n > 0,
-           ("vm_domainset_iter_first: Invalid n %d", di->di_n));
+       KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n));
        switch (di->di_policy) {
        case DOMAINSET_POLICY_FIRSTTOUCH:
                /*
@@ -149,11 +148,10 @@ vm_domainset_iter_next(struct vm_domainset_iter *di, int 
*domain)
                vm_domainset_iter_prefer(di, domain);
                break;
        default:
-               panic("vm_domainset_iter_first: Unknown policy %d",
-                   di->di_policy);
+               panic("%s: Unknown policy %d", __func__, di->di_policy);
        }
        KASSERT(*domain < vm_ndomains,
-           ("vm_domainset_iter_next: Invalid domain %d", *domain));
+           ("%s: Invalid domain %d", __func__, *domain));
 }
 
 static void
@@ -189,13 +187,11 @@ vm_domainset_iter_first(struct vm_domainset_iter *di, int 
*domain)
                di->di_n = di->di_domain->ds_cnt;
                break;
        default:
-               panic("vm_domainset_iter_first: Unknown policy %d",
-                   di->di_policy);
+               panic("%s: Unknown policy %d", __func__, di->di_policy);
        }
-       KASSERT(di->di_n > 0,
-           ("vm_domainset_iter_first: Invalid n %d", di->di_n));
+       KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n));
        KASSERT(*domain < vm_ndomains,
-           ("vm_domainset_iter_first: Invalid domain %d", *domain));
+           ("%s: Invalid domain %d", __func__, *domain));
 }
 
 void

Reply via email to