Skip to content

Commit 142bcda

Browse files
Doug MooreDoug Moore
authored andcommitted
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
1 parent fae33d1 commit 142bcda

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

sys/vm/vm_page.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4880,7 +4880,7 @@ int
48804880
vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex,
48814881
int allocflags, struct pctrie_iter *pages)
48824882
{
4883-
vm_page_t m, mpred;
4883+
vm_page_t m;
48844884
vm_page_t ma[VM_INITIAL_PAGEIN];
48854885
int after, i, pflags, rv;
48864886

@@ -4924,14 +4924,12 @@ vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex,
49244924
*mp = NULL;
49254925
return (VM_PAGER_FAIL);
49264926
} else {
4927-
mpred = vm_radix_iter_lookup_lt(pages, pindex);
49284927
m = vm_page_alloc_iter(object, pindex, pflags, pages);
49294928
if (m == NULL) {
49304929
if (!vm_pager_can_alloc_page(object, pindex)) {
49314930
*mp = NULL;
49324931
return (VM_PAGER_AGAIN);
49334932
}
4934-
pctrie_iter_reset(pages);
49354933
goto retrylookup;
49364934
}
49374935
}
@@ -4941,7 +4939,7 @@ vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex,
49414939
after = MIN(after, VM_INITIAL_PAGEIN);
49424940
after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT);
49434941
after = MAX(after, 1);
4944-
ma[0] = mpred = m;
4942+
ma[0] = m;
49454943
pctrie_iter_reset(pages);
49464944
for (i = 1; i < after; i++) {
49474945
m = vm_radix_iter_lookup(pages, pindex + i);
@@ -4952,7 +4950,7 @@ vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex,
49524950
break;
49534951
} else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m))
49544952
break;
4955-
mpred = ma[i] = m;
4953+
ma[i] = m;
49564954
}
49574955
after = i;
49584956
vm_object_pip_add(object, after);

0 commit comments

Comments
 (0)