From nobody Sun Jun 7 19:22:59 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 4gYQ7731qMz6fwGT for ; Sun, 07 Jun 2026 19:22:59 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYQ772FJVz3HSD for ; Sun, 07 Jun 2026 19:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780860179; 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=z3rlinoqeKFUn1qGaX4+d2T93py09Nxn9W7R1maLtgg=; b=YeJpQdnoh/6ZwbmKAyrHrC6xjJguqi8/1BA25uQX5mRvMO/ElVW9kMmd+kswHWLzJr9DGd uVIUFZJsEshspXWUWyClvRIlAf0N6CVtek9nMmdPIZJZ7+C87lZMaY7ZBJFbRQEqQ3s0V+ W+CplehVHBvnv8QtlvWjQrccpURFsU/kQoIq/WuQGRIvbHLoF1IBpqj7BO2e28YAxNSzQe FyGdwuNpPvwGmYfbd+ax1vusteNquNiD9Ai4QAssIepUnolSuQma/jX0IE7cxJA7bP1dcl La8BweIdE6c+yNAUYogI+Olp6OD/dsRcClyh8kjapbHwvdwwNWx1I/XPhhoahg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780860179; a=rsa-sha256; cv=none; b=F8FsvoBl5o2JxFqIV0vUwCM5c78A5TckrwUSLB3QN2xC3wbzrJmf1RMeOmLVqBs2547192 MYCXsaFM5F1+YojCb9uPBveDb2vdBxjw9A5zwigvrM17CnjbBt9VOPdp9UwcCHArFsu+Ux 9igWSLk1Td1gUOlWcUtJEDNi8xsKnzbCZtjv1ChbhhaQYu68Yj7CV61L0Gb50XCmmpPr1g MILSI3wAdGkt4j/z0gEChtf2x9oari/dyMGp6zM0uxaIebQkBrQmFa0gKjQuQFyvQx/o0e dLqCGM5wJBkxyLxAXG+gRdcl5qY77ToAElrYg1qgQNaYAizImR8sr2zPEat61g== 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=1780860179; 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=z3rlinoqeKFUn1qGaX4+d2T93py09Nxn9W7R1maLtgg=; b=AqXwSEUIOoWzhlpOccdryrleOLMkqYakmnmOphaY10stNBZTHZqMjYErBvFqxILHWU9Jqx 34gge51oDFd0wX+EtEDKVM/ZMTMaInaQpWNWOBJuBmNkArpxN1Ta5d/vNsgd8z5pTkJNB/ ieWMum+VoESgU9Xwy+Fb/6Sxofw2DsXoXV1obAVS5ENalYcLgIa77lKwGuXJqBt7KmLoAv yuGlixK5BJokX3O6x0zFDz577jYOnKaWGnD+dCq4kEpmf/IGI9GxZRihS2j9KcxPFYEYwO VZcXTsEGF8QDjC8CLJ0R1Io5eaGqd0/KDi4uWQwhC+5pV+I92iQywkukGY7n5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYQ771W7DzfJ for ; Sun, 07 Jun 2026 19:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Jun 2026 19:22:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b1b4871f373e - main - zfs: fix sysctl_os.c 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 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1b4871f373e9f2a5defdc1242543be291f5e9d9 Auto-Submitted: auto-generated Date: Sun, 07 Jun 2026 19:22:59 +0000 Message-Id: <6a25c513.3d6f6.2401f8a9@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b1b4871f373e9f2a5defdc1242543be291f5e9d9 commit b1b4871f373e9f2a5defdc1242543be291f5e9d9 Author: Martin Matuska AuthorDate: 2026-06-07 19:15:40 +0000 Commit: Martin Matuska CommitDate: 2026-06-07 19:18:22 +0000 zfs: fix sysctl_os.c Correctly declare vfs.zfs.metaslab.condense_pct The following sysctls have moved to metaslab.c: vfs.zfs.metaslab.df_alloc_threshold vfs.zfs.metaslab.df_free_pct vfs.zfs.metaslab.sm_blksz_no_log vfs.zfs.metaslab.sm_blksz_with_log Reported by: dim@FreeBSD.org --- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 55 +--------------------- 1 file changed, 1 insertion(+), 54 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 447aa5f8300d..a253280df0d6 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c @@ -512,33 +512,6 @@ param_set_active_allocator(SYSCTL_HANDLER_ARGS) return (param_set_active_allocator_common(buf)); } -/* - * In pools where the log space map feature is not enabled we touch - * multiple metaslabs (and their respective space maps) with each - * transaction group. Thus, we benefit from having a small space map - * block size since it allows us to issue more I/O operations scattered - * around the disk. So a sane default for the space map block size - * is 8~16K. - */ -extern int zfs_metaslab_sm_blksz_no_log; - -SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, sm_blksz_no_log, - CTLFLAG_RDTUN, &zfs_metaslab_sm_blksz_no_log, 0, - "Block size for space map in pools with log space map disabled. " - "Power of 2 greater than 4096."); - -/* - * When the log space map feature is enabled, we accumulate a lot of - * changes per metaslab that are flushed once in a while so we benefit - * from a bigger block size like 128K for the metaslab space maps. - */ -extern int zfs_metaslab_sm_blksz_with_log; - -SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, sm_blksz_with_log, - CTLFLAG_RDTUN, &zfs_metaslab_sm_blksz_with_log, 0, - "Block size for space map in pools with log space map enabled. " - "Power of 2 greater than 4096."); - /* * 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 @@ -547,7 +520,7 @@ SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, sm_blksz_with_log, */ extern uint_t zfs_metaslab_condense_pct; -SYSCTL_UINT(_vfs_zfs, OID_AUTO, 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"); @@ -565,32 +538,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, removal_suspend_progress, CTLFLAG_RWTUN, &zfs_removal_suspend_progress, 0, "Ensures certain actions can happen while in the middle of a removal"); -/* - * Minimum size which forces the dynamic allocator to change - * it's allocation strategy. Once the space map cannot satisfy - * an allocation of this size then it switches to using more - * aggressive strategy (i.e search by size rather than offset). - */ -extern uint64_t metaslab_df_alloc_threshold; - -SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, df_alloc_threshold, - CTLFLAG_RWTUN, &metaslab_df_alloc_threshold, 0, - "Minimum size which forces the dynamic allocator to change its" - " allocation strategy"); - -/* - * The minimum free space, in percent, which must be available - * in a space map to continue allocations in a first-fit fashion. - * Once the space map's free space drops below this level we dynamically - * switch to using best-fit allocations. - */ -extern uint_t metaslab_df_free_pct; - -SYSCTL_UINT(_vfs_zfs_metaslab, OID_AUTO, df_free_pct, - CTLFLAG_RWTUN, &metaslab_df_free_pct, 0, - "The minimum free space, in percent, which must be available in a" - " space map to continue allocations in a first-fit fashion"); - /* mmp.c */ int