From nobody Thu Oct 24 23:08:41 2024 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 4XZM6K50nRz5Zyjd; Thu, 24 Oct 2024 23:08:41 +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 4XZM6K38JXz4HW0; Thu, 24 Oct 2024 23:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811321; 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=h9pQabshHbSuhzH+wVa1hn4uGG4pVIkr5aV1RGTqfSk=; b=PSSBbcG8dUwv8Gf50YwtF6rAQAw46IasKXtN6qrpNS8akUSAYfe1TFmXhharpqoe4VLI/x V1cuBk6hNbk821rM1wbAHpfWsZ7Nkd8yfKUjsSdnCtOuqsVAFGB87/8Z100kzYOfIdRrJe 2Xy13xOP0vpFych2KmnPZd9u/07llfgL/ibzfGeLsNFSXhgKbZfiLsNMOKSnWyuDeItF1v NQAJwSevOFT/20fw5OVdv34i/DG946Ru7Rrg7R9+rpCuhYCpXqVt5nB2oFWKCU4ASqV4ym kP/baeJ34IZytcYV3RQMUzaOZUQQQVg4s1AdCKRlGEoMuK9zGTkJFVr3lcA3XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811321; 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=h9pQabshHbSuhzH+wVa1hn4uGG4pVIkr5aV1RGTqfSk=; b=KLILL0ppqu+I7F/+XS/8yM8Z8lffQmlTo65g+2uWXfvhSBOe4JBQq9pi8Hnv3rZ/o+cMBi NCr5DCebm6nm+HuU+c9yPrXtaDbngCKR17fIwH4rAFVWZyd49z1yIyyAeb+yyiI0DvWL2p M/9E92ZHcl02JkjrkfbeC+NEbz2bPKqsj9ZyiAtyq09WLT7+4iBHe0toLocaSxrPX5Fmie gtk0Fo2/qOs32uJnQdeiZw7Rf4XOppbHD6U3ncOr1kTNNvkZlQ965+yyJmR2DSkn6sB4xp d2s9CugW8igYjg+JjoQ7A6o8250UDUwaHDxj3+QoVvVzWoTmE/wFLe5xWdsv9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729811321; a=rsa-sha256; cv=none; b=GYQfJukbM4B+joVIgjNJd7yzkB9BkSu/7/gsm0s2pFIE29YeZ+RsGXxMUBJxaiFjgrFQ4c MSuo/NnCVCP97lhGlbt1S6sCXQveEoP+ikOekEljU6IDFxUgILIACqgzh42299zxtNoNcq RC6RpOV3iigbdmp/CMZs58VIHPV7vR2qMf1FL3mAcYSlvGDMKFrWp+IGgH8uYXOuh5ow3p jVcoRGj+aY45XeSo2i/+5jvhmHBkaa07E/T3P+XUMByf9JcItRciCU0mWTpOuECp98Xep3 uswWvaNCVazEbZtFCyudijINAZsAj8zdu1lBq7V1mvWjMjzgXpPh4jafO26Cng== 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 4XZM6K2GQpz12Kd; Thu, 24 Oct 2024 23:08:41 +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 49ON8fvQ049202; Thu, 24 Oct 2024 23:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ON8fuA049199; Thu, 24 Oct 2024 23:08:41 GMT (envelope-from git) Date: Thu, 24 Oct 2024 23:08:41 GMT Message-Id: <202410242308.49ON8fuA049199@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: faa9356f97d2 - main - swap_pager: fix seek_hole assert 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: faa9356f97d23655b801f77201692e6de9ae7caa Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=faa9356f97d23655b801f77201692e6de9ae7caa commit faa9356f97d23655b801f77201692e6de9ae7caa Author: Doug Moore AuthorDate: 2024-10-24 23:06:59 +0000 Commit: Doug Moore CommitDate: 2024-10-24 23:08:32 +0000 swap_pager: fix seek_hole assert Moving code from tmpfs to swap_pager introduced another WLOCKED object assert that should have been an RLOCKED object assert. Fix it. --- sys/vm/swap_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3d21d42da6c3..e1795e8fd3ae 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2524,7 +2524,7 @@ swap_pager_seek_hole(vm_object_t object, vm_pindex_t pindex) struct swblk *sb; vm_page_t m; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_RLOCKED(object); vm_page_iter_init(&pages, object); swblk_iter_init_only(&blks, object); while (((m = vm_page_iter_lookup(&pages, pindex)) != NULL &&