Date: Wed, 17 Dec 2025 02:46:28 +0000 From: Austin Shafer <ashafer@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 30d5fc82cf8b - stable/15 - linuxkpi: clean up stray pctrie_iter_reset Message-ID: <69421984.3d8d5.75628d00@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by ashafer: URL: https://cgit.FreeBSD.org/src/commit/?id=30d5fc82cf8beedbc8996fd14392f21c7143cbaf commit 30d5fc82cf8beedbc8996fd14392f21c7143cbaf Author: Austin Shafer <ashafer@FreeBSD.org> AuthorDate: 2025-12-09 15:33:17 +0000 Commit: Austin Shafer <ashafer@FreeBSD.org> CommitDate: 2025-12-17 02:45:17 +0000 linuxkpi: clean up stray pctrie_iter_reset This removes an extraneous pctrie_iter_reset before returning. This is not needed as it simply clears a local variable that will get cleaned up anyway as we immediately return from the function. MFC after: 1 week Sponsored by: NVIDIA Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D54153 (cherry picked from commit 4ae02d9792272fa8c43f4982cf338123d9bcaed2) --- sys/compat/linuxkpi/common/src/linux_page.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 2b2827579cba..c0d9d71ba1ce 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -345,10 +345,8 @@ retry: page = vm_page_grab_iter(vm_obj, pindex, VM_ALLOC_NOCREAT, &pages); if (page == NULL) { page = PHYS_TO_VM_PAGE(IDX_TO_OFF(pfn)); - if (page == NULL) { - pctrie_iter_reset(&pages); + if (page == NULL) return (VM_FAULT_SIGBUS); - } if (!vm_page_busy_acquire(page, VM_ALLOC_WAITFAIL)) { pctrie_iter_reset(&pages); goto retry;help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69421984.3d8d5.75628d00>