From nobody Tue Dec 30 03:25:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ53Bwmz6MknR for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ50hY0z3VjZ for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=mxL/YGH9AYSIlNnu6Ac6ZjztJLFjAOmv35v+Hm1p1mp3rRL6dF3PBDY3UwoxtP/R3Gigsj 8ie8IRZVkK/Kh9wMRkBGHYGrMaCVRtZnNQbD859q5FR4bmpf1f0nLVMmfTcgxPecpHI4B8 Ju5M1cZbEFllwSFN4lK+kfAsqAkJBSoZ9s9yhtO9O1O/JzN5a0rwuiqsMH4YEGRUJhfc8l GepN9ydTNPq18fDUZqEj/FN1BcggvrGONdsft63V9gTYI8Zv3hOhpbdG5UFT3Qns2+b611 CgSpqTVWm2FmSTCj26E44UkbQ8a10iyemilXixaJvW7cOOSW6u7xsM+M63V0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=F8msK8ZHWvPhY/6tahHmscKyxoS3V39KpcYFWfNpkQO91YndKnALnkFKkElj+MvRL59KWi 0ApMUalxR/fPnqLlD4IuPJeV/rIVwNZ38yjFfJNzI8i6Zr78zikQITO7fOAFQyu2ecCOQ8 ZfENveqXFc+bx1sFwAXxswLyKcb7lrV2KnPqCT+5roDVnUcc6JAXEi+gTl72OHZvIEnMBW YS2AZn2cJEGhNnJTA0AsF8RaPw+JxycMad2bxfQVHi8ufBaP8jwf5UpX+smAAzD/jhAWZW II7WflKVFY9iuCpyOUB3QnG33gDuWWf4m6hymB+Xc14bJ6kleIU3+imuh/l23A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065149; a=rsa-sha256; cv=none; b=MNe1LUH8Q4U0/ftnRebg01EEyKfoH/yaEHVv4f/71PsyViIQ43whWUrd1AbL0cV0g4NfGI TP/ViRyeuFAzv+e1/JsGfYaTOCHkVVYWuDW0ifmib+HEfNDlVQSdl63KA/SfHQ7JDwRsoy hCiiyREJxnZ/+Orri7T7giWDrhznP4cq0S/SefHpULFWydakaObQFc1ISOP9xQRQ05pmgg Gcw4Xj3h2l6dpjMUAEgTFMW4fF5Y34vO0G8UNI75fsMNmiXVKAPM3vXPxcC5pA4/92h6jO Id+JGAcmcXNdiTphmLpwNEAXVGn6NG6WlfMjfJ/qsX1ZynbcaVd5rF3eWwXl/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ5054fzkHC for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9d3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: efcb109940ca - main - vm_object_coalesce(): remove commented out code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcb109940ca607130af4498e1e33b54c58ba43c Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:49 +0000 Message-Id: <6953463d.9d3e.32ca39a8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=efcb109940ca607130af4498e1e33b54c58ba43c commit efcb109940ca607130af4498e1e33b54c58ba43c Author: Konstantin Belousov AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:24:35 +0000 vm_object_coalesce(): remove commented out code Reviewed by: alc, markj 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, 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.