From nobody Sat Jan 24 00:32:18 2026 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 4dybNL3Zmsz6Q1j3 for ; Sat, 24 Jan 2026 00:32:18 +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 4dybNL20C2z44rS for ; Sat, 24 Jan 2026 00:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214738; 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=TuIeTCJ0jR1FhFdg6dOqG4+NWT4/tOUN6g1N6BLC9xQ=; b=gjgw7NHZ5MCND5ikis1KV0XSwqnNtTIdaNwxDz71j3OuTP/aXQwSqcYTGeGkrb79deHnv9 xbyLZHoM3OIholFUQ6xippKWPUQj7HdNhX1Mj3reF31BMHnlRk1aIXr+i2fNMBag1PyXl7 YrObEM0fyDsJqB1Z8InXCorn8Vcw6sfJ1dYRSgI7/g5lm30Of4i6lst1oAJvGfnOMGDNvZ LPL5DPbd7FAwto2o6YMPo+koWaX634VSlZHyihdA1/z2EzpDwRoJxYuRNQ7XHRGa4tCqsc VHd//3GmECWiDh3yYVqPVO1yDeqhH2/lrP6abKoYlTc3WsVkoB0FusuZxpVjng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214738; 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=TuIeTCJ0jR1FhFdg6dOqG4+NWT4/tOUN6g1N6BLC9xQ=; b=xlVZP5b10ZPBx6+ava6AKtQ1iL1MBSqn3Mp6CsVEpvPV/yuih4NZR05HPgCpa4hCdQjdz3 AEkfxVmhofL1F5tjt08a9eNL0RNt304ue4YkPC29y17poedXkF6OXRH5vrB8n7UjDNiGRS e9rl2+ppjY2GH8LDQ1EY19ft52Rd0mXuaJXhEw8Ar2OGSQdGI4ZnY1HNjopgy/+EkzQfCI gxTWKQcsCJZUyNiavBsHUZaDjtKJZfK9rhtiiMtx1ZQfH02Ym/YwcPNP95fcUbhazLzk3o x1j43yEJ/PWwNFLhsI6iZFzozTDfWdkFI+gnkGlMOi9n9fMnJ3k2XiydRZZtbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214738; a=rsa-sha256; cv=none; b=GZej4mex91vyu7jdNkaqKDwhKOquMCFl0IWwdDBtjfVUftA51Lo8O+tLSuYXJOIE+SFQh3 8oQfQhvAMMTsdxoC/vfNrd44NCseEXEKRoF3WQVOcAfei5vfc1YbnL+ZEtRte63YXIzOXK /9Z7Iuc8kkYQqE9fOS1ixXidzoZsgSdE1iUwBfOkwEKxNmNJolWqcL4wdntwMHD4PDb8dT mvYiOonVmz1MU1JEX5sKLPBDGzS3+qVJNlGj3selOrwODfj9eaOvOIts//1Q9ljnUufVOu RqZSm/zqY848iXRuKNFFbkQ80r8gs11tuu5yMbcK+WUBXtYtWkgk/IHJ5dpNlQ== 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 4dybNL1ZhNzj6H for ; Sat, 24 Jan 2026 00:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 84cab089ed77 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 84cab089ed771511e302ac7b4af56cec0f63cac3 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:18 +0000 Message-Id: <69741312.98db.5f0ab995@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84cab089ed771511e302ac7b4af56cec0f63cac3 commit 84cab089ed771511e302ac7b4af56cec0f63cac3 Author: Konstantin Belousov AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov 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.