From nobody Wed Jun 21 04:54:09 2023 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 4QmB415JBDz4gqVm; Wed, 21 Jun 2023 04:54:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmB414sJFz3CgW; Wed, 21 Jun 2023 04:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687323249; 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=3vY+qFL8GuPzyBxAQlUB/msPS06Qg7AZw0Q4grbzViE=; b=tYsUZGPdnF3tSSaVwfufL7aikNNhobutdQatrpjtjoWupRz1bfbq8hlzTifVnHg50YbYnX aM2DxYBYrcZoVhEVYmlzy0tqSux7Dnn1gzS1Wbu9EfTiY5CZ6taaSFwM4hbkUnU6PGwd02 0yC/X4ufO8LUwn/awJ8R8Dge8VgsSQCZ2zwihP9aK1/mnLLi+Lxw72QI4anQnxhkMe2+vK PZP5tFde1OG1GjJz7oBV0LohznT9AmyOHU2VHlmBD14h5JI2jQqt4cY/yvxJuUKoAYls3o sztwH9+2VYTw+PQZGNA+evwzPy31DFVnAhxxMREqRVclnRDwuZqHl2uSxyFeXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687323249; 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=3vY+qFL8GuPzyBxAQlUB/msPS06Qg7AZw0Q4grbzViE=; b=b/39/O3YzbGpIvOV+imGe0jpTrU36cPpkvxxBoPe01t/Ueo5wTGN3p0yPSs0b76OoJhg6f ads81702TKhjDx8S0d2OthUITCGMfN+EpYZHwhtI/3wfLxaG1yAQpfk8QOel7+f72bQQNL G7jeET3UQfpC6yZ4JFoA4Sji2fRyAlyBQYJLmPE3ynkaCYOB5VdwOkTC8vXpS8dBT21c0J qjGlywbaDXoerpFjotNB8XRe7142M2UZsEdLnL79Hd3IGOl4vYXTWx+0wtWWxc6snvoQyO xE/PdjriIZdj5CVAi3xgQuH+sDp2tIwfeWTsn1rfzv3i4XKAElWmnbSzVO4LZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687323249; a=rsa-sha256; cv=none; b=SW43Rn7bUsdsBGpUMU6vFaU/x9aMYecS32YT16XDdT0Jieiy51OIMUXW7UeXK8ym0LucQE 5JTtq9bOMiNHD4fGk0pfJSR/VLgMsf5oWHXu7Jk8ChWu7QCAIEGa+JoTcG80CdESkzknGr OxUgPSiFl924n8KgisiA1AOAg95TBqQnafMDCx2ZOTNPxn3sQREGZEx47UNSWMl13MbAoS Vbpamo8ekWiqe5Zo4r6i6+Y1BlbiOcgyw76tLOKByXnwm8IFeMT+4yLnarRHpWH4e8rDc5 7giB7c5CcUofivr+buLfkORfaCHnMf7HtsAweOmNENUW8yHRSaqEPDnCo16dZg== 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 4QmB413yWdzTB7; Wed, 21 Jun 2023 04:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L4s9kw080634; Wed, 21 Jun 2023 04:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L4s9cF080633; Wed, 21 Jun 2023 04:54:09 GMT (envelope-from git) Date: Wed, 21 Jun 2023 04:54:09 GMT Message-Id: <202306210454.35L4s9cF080633@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: 1efa7dbc0798 - main - vm_radix: drop unused function; use bool. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 1efa7dbc0798ee883e4e5d7127161032186829e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1efa7dbc0798ee883e4e5d7127161032186829e2 commit 1efa7dbc0798ee883e4e5d7127161032186829e2 Author: Doug Moore AuthorDate: 2023-06-21 04:52:27 +0000 Commit: Doug Moore CommitDate: 2023-06-21 04:52:27 +0000 vm_radix: drop unused function; use bool. Replace boolean_t with bool in vm_radix.c. Drop the unused function vm_radix_is_singleton, which is unused and has no corresponding function in subr_pctrie.c. Reviewed by: alc Differential Revision: --- sys/vm/vm_radix.c | 21 +++------------------ sys/vm/vm_radix.h | 3 +-- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 836c3652c2c1..6848f0b2c30e 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -254,7 +254,7 @@ vm_radix_root_store(struct vm_radix *rtree, struct vm_radix_node *rnode, /* * Returns TRUE if the specified radix node is a leaf and FALSE otherwise. */ -static __inline boolean_t +static __inline bool vm_radix_isleaf(struct vm_radix_node *rnode) { @@ -308,7 +308,7 @@ vm_radix_keydiff(vm_pindex_t index1, vm_pindex_t index2) * Returns TRUE if it can be determined that key does not belong to the * specified rnode. Otherwise, returns FALSE. */ -static __inline boolean_t +static __inline bool vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) { @@ -316,7 +316,7 @@ vm_radix_keybarr(struct vm_radix_node *rnode, vm_pindex_t idx) idx = vm_radix_trimkey(idx, rnode->rn_clev + 1); return (idx != rnode->rn_owner); } - return (FALSE); + return (false); } /* @@ -457,21 +457,6 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) return (0); } -/* - * Returns TRUE if the specified radix tree contains a single leaf and FALSE - * otherwise. - */ -boolean_t -vm_radix_is_singleton(struct vm_radix *rtree) -{ - struct vm_radix_node *rnode; - - rnode = vm_radix_root_load(rtree, LOCKED); - if (rnode == NULL) - return (FALSE); - return (vm_radix_isleaf(rnode)); -} - /* * Returns the value stored at the index. If the index is not present, * NULL is returned. diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h index f38956ef305e..b478cf4b734b 100644 --- a/sys/vm/vm_radix.h +++ b/sys/vm/vm_radix.h @@ -39,7 +39,6 @@ int vm_radix_insert(struct vm_radix *rtree, vm_page_t page); void vm_radix_wait(void); -boolean_t vm_radix_is_singleton(struct vm_radix *rtree); vm_page_t vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index); vm_page_t vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index); vm_page_t vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index); @@ -56,7 +55,7 @@ vm_radix_init(struct vm_radix *rtree) rtree->rt_root = 0; } -static __inline boolean_t +static __inline bool vm_radix_is_empty(struct vm_radix *rtree) {