From nobody Sat Jan 24 00:32:19 2026 X-Original-To: dev-commits-src-branches@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 4dybNM5273z6Q1lH for ; Sat, 24 Jan 2026 00:32:19 +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 4dybNM2fTnz45DD for ; Sat, 24 Jan 2026 00:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214739; 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=Lfe1toyBY1vlPCFILFzIVa5sREezfw1UAP0pDc4t13Y=; b=rwr8CEHNKZLErRSE/CrkGLNB+V7Dzk07bZuq92mDLkM2WyQYTEoJG69DQNA1amZyptzT2E tXOtUeHz2Kipk1d3daLlc8XFhuI0KZTYTtSfbB3xb7kCv96uiYGoFd4nslIhGnLeMvDkR8 YigKLmw1VygFF3V4UzFm4cTAkY0Wp5Zu5T1qxSkHqXiS6v0OBCYPZUj5UZTGFv+zOkEqWh XaHZ9UHxXyfB+enjkvsp2hSoPMl+65L5weA2/VGBCC/09+H98i3VBDfzH/lOeyqOYiHyxX nxftBoN964WT6ZF8wY9F0Qx0KwJW62csZTeLcWiOEdhYCkLU9d3o/hszCHAdJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214739; 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=Lfe1toyBY1vlPCFILFzIVa5sREezfw1UAP0pDc4t13Y=; b=qpqu/BcpAvcZRIWwU8L7SXenMPowaHMRh+Y/NhVZS5v/5GXnKCki1gTSGaaKWYjcBNr4Yt 6HeGdOyWcj3RZQJmbY/szli1JvPDiUUfKvKR2Us5zdS1SJkbYtrmMRrW5XiBz/HETbIrcw AJbXq7wDBpwPYdmdQHf9WGRFz2X/1rZpOkb17M10qJfZ7mJlrClyoLW6IP+frzoifYQr+W p/hgpdIz+47ANk69hh4gXCnoiqOmpSRqMko39uhoIZBBy2GFEtHeOA5NjNjjWiyywJl1/1 HvmXOJPerpgpiP+YcE6ANoyjWsrqgy2s9V5+sTYLRpbxVZqD/fx0ZmbdpyWUew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214739; a=rsa-sha256; cv=none; b=bFA06SLsTdh8iJOQvKqrBdAeg7dIkpfnoHTjq2c2BwRUxFyr2GK76q9HnGPsk/gggSAFWo 1y1jb0RIctxiRoW+bzNgNuw+Zpo6GyCKWRLQFNsBgAZDNFgYQ9gj6weaOc3KxLUBluwJGV 6SI8vl1RTq0jXdFXmQ+VftMfAkpBs6loQVSjGt8dSyKw9GW1wdx8gi6bkUFqSCGrWPrNiP KHuW2xAqxWsT5iW65qv9j/zB7eNoVupbd9GH32dohAyLayvCTCG+GpjXkUNV+EaLc1y/Pl r8Y5BdcDt+WRuxu51f1FUr15Yl2kKfyOeU2EMQHn/y20+32PNJHG6R7KX6ycbA== 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 4dybNM22LyzhP2 for ; Sat, 24 Jan 2026 00:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b23b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 99fab30f7272 - stable/15 - vm_object_coalesce(): simplify common expression List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 99fab30f7272c3448d11f5e4a0b98e5ecb9de537 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:19 +0000 Message-Id: <69741313.b23b.112e7efa@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99fab30f7272c3448d11f5e4a0b98e5ecb9de537 commit 99fab30f7272c3448d11f5e4a0b98e5ecb9de537 Author: Konstantin Belousov AuthorDate: 2025-12-18 22:14:29 +0000 Commit: Konstantin Belousov 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));