The branch main has been updated by dougm:
URL:
https://cgit.FreeBSD.org/src/commit/?id=142bcdad1f67f8f6de04ebc27d8dbba56c39c788
commit 142bcdad1f67f8f6de04ebc27d8dbba56c39c788
Author: Doug Moore <do...@freebsd.org>
AuthorDate: 2025-05-25 21:13:28 +0000
Commit: Doug Moore <do...@freebsd.org>
CommitDate: 2025-05-25 21:13:28 +0000
vm_page: drop mpred from grab_valid_iter()
Variable mpred in vm_page_grab_valid_iter() has become a write-only
variable. Drop it.
In grab_valid_iter(), drop a pctrie_iter_reset() call already handled
in vm_page_alloc_iter().
Reviewed by: alc
Differential Revision: https://reviews.freebsd.org/D50424
---
sys/vm/vm_page.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index ea6fbdbc6386..a3ebc92175f8 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -4880,7 +4880,7 @@ int
vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex,
int allocflags, struct pctrie_iter *pages)
{
- vm_page_t m, mpred;
+ vm_page_t m;
vm_page_t ma[VM_INITIAL_PAGEIN];
int after, i, pflags, rv;
@@ -4924,14 +4924,12 @@ retrylookup:
*mp = NULL;
return (VM_PAGER_FAIL);
} else {
- mpred = vm_radix_iter_lookup_lt(pages, pindex);
m = vm_page_alloc_iter(object, pindex, pflags, pages);
if (m == NULL) {
if (!vm_pager_can_alloc_page(object, pindex)) {
*mp = NULL;
return (VM_PAGER_AGAIN);
}
- pctrie_iter_reset(pages);
goto retrylookup;
}
}
@@ -4941,7 +4939,7 @@ retrylookup:
after = MIN(after, VM_INITIAL_PAGEIN);
after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT);
after = MAX(after, 1);
- ma[0] = mpred = m;
+ ma[0] = m;
pctrie_iter_reset(pages);
for (i = 1; i < after; i++) {
m = vm_radix_iter_lookup(pages, pindex + i);
@@ -4952,7 +4950,7 @@ retrylookup:
break;
} else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m))
break;
- mpred = ma[i] = m;
+ ma[i] = m;
}
after = i;
vm_object_pip_add(object, after);
