Date: Sat, 24 Jan 2026 00:32:19 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 99fab30f7272 - stable/15 - vm_object_coalesce(): simplify common expression Message-ID: <69741313.b23b.112e7efa@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99fab30f7272c3448d11f5e4a0b98e5ecb9de537 commit 99fab30f7272c3448d11f5e4a0b98e5ecb9de537 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-12-18 22:14:29 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): simplify common expression (cherry picked from commit e7053d9a126a60b3c0b1348b6c5131b5f2025894) --- 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));home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69741313.b23b.112e7efa>