git: e7053d9a126a - main - vm_object_coalesce(): simplify common expression

The branch main has been updated by kib:

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

commit e7053d9a126a60b3c0b1348b6c5131b5f2025894
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-12-18 22:14:29 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-12-30 03:25:20 +0000

    vm_object_coalesce(): simplify common expression
    
    Add the next_end variable to replace commonly occuring the
    next_pindex + next_size expression.
    
    Suggested by:   alc
    Reviewed by:    alc, markj
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D54263
---
 sys/vm/vm_object.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index a8ec98f2c98d..36edb279bbce 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -2163,7 +2163,7 @@ boolean_t
 vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
     vm_size_t prev_size, vm_size_t next_size, boolean_t reserved)
 {
-	vm_pindex_t next_pindex;
+	vm_pindex_t next_end, next_pindex;
 
 	if (prev_object == NULL)
 		return (TRUE);
@@ -2197,6 +2197,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
 		return (FALSE);
 	}
 
+	next_end = next_pindex + next_size;
+
 	/*
 	 * Account for the charge.
 	 */
@@ -2224,14 +2226,13 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
 	 * deallocation.
 	 */
 	if (next_pindex < prev_object->size)
-		vm_object_page_remove(prev_object, next_pindex, next_pindex +
-		    next_size, 0);
+		vm_object_page_remove(prev_object, next_pindex, next_end, 0);
 
 	/*
 	 * Extend the object if necessary.
 	 */
-	if (next_pindex + next_size > prev_object->size)
-		prev_object->size = next_pindex + next_size;
+	if (next_end > prev_object->size)
+		prev_object->size = next_end;
 
 #ifdef INVARIANTS
 	/*
@@ -2243,7 +2244,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
 		vm_pindex_t pidx;
 
 		pidx = swap_pager_seek_data(prev_object, next_pindex);
-		KASSERT(pidx >= next_pindex + next_size,
+		KASSERT(pidx >= next_end,
 		    ("found obj %p pindex %#jx e %#jx %#jx %#jx",
 		    prev_object, pidx, (uintmax_t)prev_offset,
 		    (uintmax_t)prev_size, (uintmax_t)next_size));