git: fa462b8b8ebc - main - vm_object: drop pointless assignment

The branch main has been updated by dougm:

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

commit fa462b8b8ebc5db0be95c478b21ae8cc1288cdd2
Author:     Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2025-02-15 18:09:26 +0000
Commit:     Doug Moore <dougm@FreeBSD.org>
CommitDate: 2025-02-15 18:09:26 +0000

    vm_object: drop pointless assignment
    
    An assignment in collapse_scan() has become useless because, on every
    path, another assignment to that variable overrides it before that
    variable is read.  Another assignment can be avoided sometimes, so
    move it down in the loop to where it's really necessary.
    
    Reviewed by:    alc, markj
    Differential Revision:  https://reviews.freebsd.org/D49017
---
 sys/vm/vm_object.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index a3cfb4d036be..0f0f8cc6f5bf 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1703,9 +1703,6 @@ vm_object_collapse_scan(vm_object_t object)
 	 */
 	vm_page_iter_init(&pages, backing_object);
 	for (p = vm_page_iter_lookup_ge(&pages, 0); p != NULL; p = next) {
-		next = TAILQ_NEXT(p, listq);
-		new_pindex = p->pindex - backing_offset_index;
-
 		/*
 		 * Check for busy page
 		 */
@@ -1721,8 +1718,8 @@ vm_object_collapse_scan(vm_object_t object)
 		    ("vm_object_collapse_scan: object mismatch %p != %p",
 		    p->object, backing_object));
 
-		if (p->pindex < backing_offset_index ||
-		    new_pindex >= object->size) {
+		if (p->pindex < backing_offset_index || object->size <=
+		    (new_pindex = p->pindex - backing_offset_index)) {
 			vm_pager_freespace(backing_object, p->pindex, 1);
 
 			KASSERT(!pmap_page_is_mapped(p),