From nobody Sat Oct 10 07:13:27 2026 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 4j1w1h0tt2z6k5Bn for ; Sat, 10 Oct 2026 07:13:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1w1h08s0z4Cn7 for ; Sat, 10 Oct 2026 07:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791616408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8egb4xi/SOsYrW6nnztYlIISHE70W5/6r11Yh+Oa1o=; b=IOl+oIvfl0fpJuW6ZhetZd95sLXeQY5E/bXwkY3gm+Z62xvz4zlZFw9A5/Y2uX+3qn8EGl ZlteZlmwR/ASHcceYBUbkgMjjVOyf1p9QWZxfqZrFmpi0rSF3lhYHIjVaGJNVZl25OZGin BXuxXjGsNNlx2eJy4I/G46o2OAF4PCu3ijGc6AuELjGZwQJPMfIh9JXk8umGkNplhsu9D4 jHrwCZjigX1bv+F/1+KxT0XkL35yL9xk/BIWHSR3obEA6AVKnbgGPRvIP9j//Fe4ibV6Sq WB93Td7XQHZ3Eqit6kLLCgUdHq1Je5fqWuD7tlHdlkCyRHyegqbcGi+MVqq/VQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791616408; b=c2ZiBYfNplrXq2xYiVq6Rh3yStpKgy0yBkay2CC7H3omcHY52o9ZDhkjADKokQlMebSKeN BkdJfWDgh1o56tVH8LsA2+mCMijd+S9FtDo4o8RJo0qp7i82sYLRKWE+G/H4JPQkCJpj1w IknSvbNQBc7IE7wDigI0R9Tjp40GNQFBFGCu7Sdmg0nyMaSbBFJ6ZjiCQgRNykFMb1UT2+ juY+N/GoULFMSH129hzw7MGZ80l7r0f3/mHz2LAA/E3FIU9nVpyrIBSUW1EgzY7Jf3NcSy hndS/KQIN7mZtHTPx3NHSgwUcHDxwcUpFpzuOBZyw7vLEr56nPSgcrPhsIx1ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791616408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8egb4xi/SOsYrW6nnztYlIISHE70W5/6r11Yh+Oa1o=; b=YuOeFltDvlJKD5c1Ecwp2MXOPZ+g3gpr3M+6jOybrrML9GSxPQDB6gSyz5ce567hu3Eg4C VJ9aD0RUFmKffU77F5r/BziHAB0GpyV61D7RA+gUmXRMZuFjr9ZTEABGDbJjzUx614g2Zh tsxmtHxWnqVMh8DObElu+3DeipKN1t2NxOjXqhJVu+GXWCSfNfNU08M5JIXaMBlaOWXE6W fEo8zXin2BRQ+rUClqP39uEMtjwg9Bfk8qIz2hF4Azmmd/IplyBlq16mAGz5QOuxskkLqf 2MSHKamJxT7dDN3pbhVxOJRRixa8uMzmKBNbsCX4k2MuD3qw3Rw7UiUwnCjf6w== 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 4j1w1g636Kzmd2 for ; Sat, 10 Oct 2026 07:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3096d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 07:13:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Christos Longros From: Enji Cooper Subject: git: 62e958df018a - main - zfs: drop duplicate `vfs.zfs.metaslab.condense_pct` sysctl List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62e958df018a0af83252c4e8f63208be41fc14a8 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 07:13:27 +0000 Message-Id: <6ac9e597.3096d.3c75fb2a@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=62e958df018a0af83252c4e8f63208be41fc14a8 commit 62e958df018a0af83252c4e8f63208be41fc14a8 Author: Christos Longros AuthorDate: 2026-10-10 07:11:03 +0000 Commit: Enji Cooper CommitDate: 2026-10-10 07:11:14 +0000 zfs: drop duplicate `vfs.zfs.metaslab.condense_pct` sysctl `metaslab.c` already registers this tunable via `ZFS_MODULE_PARAM`, so the `SYSCTL_UINT` here is a second registration of the same leaf. This resulted in messages like: ``` sysctl_register_oid: can't re-use a leaf (vfs.zfs.metaslab.condense_pct) ``` Remove the duplicate sysctl registration, as upstream (OpenZFS) did. MFC after: 1 week Signed-off-by: Christos Longros Reviewed by: imp, mm, ngie Differential Revision: https://reviews.freebsd.org/D57721 --- sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c index 00a027f9101e..834041f33e67 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c @@ -513,19 +513,6 @@ param_set_active_allocator(SYSCTL_HANDLER_ARGS) return (param_set_active_allocator_common(buf)); } -/* - * The in-core space map representation is more compact than its on-disk form. - * The zfs_metaslab_condense_pct determines how much more compact the in-core - * space map representation must be before we compact it on-disk. - * Values should be greater than or equal to 100. - */ -extern uint_t zfs_metaslab_condense_pct; - -SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, condense_pct, - CTLFLAG_RWTUN, &zfs_metaslab_condense_pct, 0, - "Condense on-disk spacemap when it is more than this many percents" - " of in-memory counterpart"); - extern uint_t zfs_remove_max_segment; SYSCTL_UINT(_vfs_zfs, OID_AUTO, remove_max_segment,