From nobody Sat Feb 15 18:11:31 2025 X-Original-To: dev-commits-src-main@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 4YwH6r1qYDz5ntJ2; Sat, 15 Feb 2025 18:11:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwH6q4snXz3lT5; Sat, 15 Feb 2025 18:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739643091; 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=LdVUuwvTDo0ztwiQ8GVcv9RT5btq5LGhM76aKFzR6GQ=; b=oV15fVG24o2LpmOxhLWfhvOhhMYl7A1WUkLQZ3ceO1uxGAipuUHkB0rtaspCgJqTk4+zxw QuYgGf+hU/ggK9VeMo5/v3ssNWzBizlUjpY4EylALrpXjwg0mk0zARxlXCUhXV8mx6qIlo 6OAb2vvYFX7Eak+OL111a79QbGa6lgyLlsPYAhJfzV+u6wAb0gjKIL61EIxHPylbSjMf4I QMp0+x2y6mMcTyNCmWzwRJZT1c9+K/tzFCad6XGaWVlJLhYynqpOl4oqqxepwNJMi/AfYJ 3ty5xYfkQgw6HY20h477j25UOX2YviB7yghjuqpF89GmTDliy0MaT91B4df+Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739643091; a=rsa-sha256; cv=none; b=H9g0IlFPOzSxXATnaJ1mcpFEHdO6/GYggo8CBkG68h6DdYb7NQTgumxazVe9iw30iJlffv Y52F4FgaFpb7eSqJ8H5QTlcub4mRNkTs+V253rb9+XpuBZiFpZeTO/jE/sCuX4Vcix85jr 7IkgfC7UkYXN7gZjcuDkNokcn1RSL113pCVocR9tVUIM+VOnySrCMIdyu9bbzBh5lravVM iA374wtroKaj7Xclacf8egc3B7LaP/OxGusWZD2D3SciKPLvy5OE5eg+rEttF9zwZfC/6O 9FOJhpUFhyRjhDpCzPkypZ7AcBS9X9DH9hnFxu5i+AvszwANV8nX0xUa/invKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739643091; 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=LdVUuwvTDo0ztwiQ8GVcv9RT5btq5LGhM76aKFzR6GQ=; b=P2VVEiJ/cKqW6oDbcJKmpoZzgGJiWlHia/vA2Cs3Qwm4fuN14rW6R5/2BjxvSkBMecPCDI 3XAhNbB6bAGo8J5OBFQwDhCYVvwyaJmTpUB5E9NZqfE/rU0+84SjF6J8WvLiu2ku580jqz vW35qg6Uf8CorikbX21Yff/dmXQ6vR4XkTfyPNmr6hL+BxzDHd7IkQbkReN08H0svueAsq Cq6M+tVNU89C6VTNwswdqwy6x7FvJGBqhHwU7sYg3DBSfB7BGLv+HPQZSWUF2F6ESSsE+W BwvvTVQpyNnWVGior9PKxZfa/NPF65JI/8V9G8kow49lgClIhmjyHYYDrWz26Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwH6q4CVsz1Qpj; Sat, 15 Feb 2025 18:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51FIBVNI013409; Sat, 15 Feb 2025 18:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FIBVok013406; Sat, 15 Feb 2025 18:11:31 GMT (envelope-from git) Date: Sat, 15 Feb 2025 18:11:31 GMT Message-Id: <202502151811.51FIBVok013406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: fa462b8b8ebc - main - vm_object: drop pointless assignment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa462b8b8ebc5db0be95c478b21ae8cc1288cdd2 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=fa462b8b8ebc5db0be95c478b21ae8cc1288cdd2 commit fa462b8b8ebc5db0be95c478b21ae8cc1288cdd2 Author: Doug Moore AuthorDate: 2025-02-15 18:09:26 +0000 Commit: Doug Moore CommitDate: 2025-02-15 18:09:26 +0000 vm_object: drop pointless assignment An assignment in collapse_scan() has become useless because, on every path, another assignment to that variable overrides it before that variable is read. Another assignment can be avoided sometimes, so move it down in the loop to where it's really necessary. Reviewed by: alc, markj Differential Revision: https://reviews.freebsd.org/D49017 --- sys/vm/vm_object.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index a3cfb4d036be..0f0f8cc6f5bf 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1703,9 +1703,6 @@ vm_object_collapse_scan(vm_object_t object) */ vm_page_iter_init(&pages, backing_object); for (p = vm_page_iter_lookup_ge(&pages, 0); p != NULL; p = next) { - next = TAILQ_NEXT(p, listq); - new_pindex = p->pindex - backing_offset_index; - /* * Check for busy page */ @@ -1721,8 +1718,8 @@ vm_object_collapse_scan(vm_object_t object) ("vm_object_collapse_scan: object mismatch %p != %p", p->object, backing_object)); - if (p->pindex < backing_offset_index || - new_pindex >= object->size) { + if (p->pindex < backing_offset_index || object->size <= + (new_pindex = p->pindex - backing_offset_index)) { vm_pager_freespace(backing_object, p->pindex, 1); KASSERT(!pmap_page_is_mapped(p),