The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84cab089ed771511e302ac7b4af56cec0f63cac3
commit 84cab089ed771511e302ac7b4af56cec0f63cac3 Author: Konstantin Belousov <[email protected]> AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): remove commented out code (cherry picked from commit efcb109940ca607130af4498e1e33b54c58ba43c) --- sys/vm/vm_object.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 117900135ac3..a8ec98f2c98d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2223,20 +2223,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * Remove any pages that may still be in the object from a previous * deallocation. */ - if (next_pindex < prev_object->size) { + if (next_pindex < prev_object->size) vm_object_page_remove(prev_object, next_pindex, next_pindex + next_size, 0); -#if 0 - if (prev_object->cred != NULL) { - KASSERT(prev_object->charge >= - ptoa(prev_object->size - next_pindex), - ("object %p overcharged 1 %jx %jx", prev_object, - (uintmax_t)next_pindex, (uintmax_t)next_size)); - prev_object->charge -= ptoa(prev_object->size - - next_pindex); - } -#endif - } /* * Extend the object if necessary.
