From nobody Wed Oct 01 07:12:04 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 4cc5hh5kxqz691Yc; Wed, 01 Oct 2025 07:12:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cc5hh5Crkz3qvG; Wed, 01 Oct 2025 07:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759302724; 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=F0RDFBWL5ubZZL1zeJi9rSP6K9cwYgXBJp5dNfsLydU=; b=GWSXhcKjgmzZ5YIiogZ3gxu+CHr06x2eVfN1cXpNoNtO9F6rroqiey0q/vdRLWSaqqTjUZ lX3ULu2Vnz8wcijeU1jIEnPyALIqUosuXpLMZQm9bxDxHIOt0dLanBf+J6uNI6s8QBx9zY Z7RPdhI0MnBkF4eu318ZklA9DKcF4B/KKzimBfvh2R0pZB3iucnGbp0CmqheZkK/IiHavM bspQqfkzEH6tCki2lR0NKaLzPW+VKLU4XxQrtcMgwfW0lN8b+oKoQsli+Ql0SSY2QC9Uy6 iWd22ghbsJ5zLqKI1G4t5gm+gLtXDyZaDeRIPr+rykw+BskJoeqlmcgt1glxIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759302724; 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=F0RDFBWL5ubZZL1zeJi9rSP6K9cwYgXBJp5dNfsLydU=; b=IhuzLIFGOBiD7UFVsss/IRyImabQdd1B1EF0W+lI5yGK+ANl1MQKVUVX7N2X8nQG7z3BsV XLb9I0l4QDsOixUObg4lc02Gnf34vfOj3RLkopdRERGvbedSaQm4pdXVgxnJ2ckmSD9+kg jh1hnAXF/KuFuTeyVAHhaCswoQpveuSFAHSEWJLF6+ycbD8MO3LRHcIe/ScgU5BRqwxl4K /Fy3jP4uqUIY1lkDFbgZjZs9yAoCaY+BeUgCH7AI392t6w/SIbIXzVrXVdPgtSfJTPaLnP Tp7cPP+0RYNtP8UzwEG28c7wSsL2QJvIHIByzIGHsKeNFu0ah2ERUBRx9l7OwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759302724; a=rsa-sha256; cv=none; b=Y29EMtYZDVzOXnq19MmZ2Pl/+q0PJJ2sNkoz/kvzmHtrFu+iFXRARfUoDfBVqruHcGMzJU Q/X8oGBs/IeX2bu8MVc7+SX8ba2vBSCsDPZglxIYRKiD9j7whWCLsgQXC9C/u78+2S/dlf EU3bvt1aUl0R6yu2zi9bUiF1+mLgJJqyoqt75SoiqQ3+6FABHnxrUQLXMvSC77TTXUvYLO whybNgh6qVCd6N/kTAIF2k1eDnAnyCqe9N+m91Mm8RUyzWcTexF2+gRZhP909r8Lsp1CGO S0+A5wvQUJcyRYdaY9IfRbry8Iwrri7I4z9kMI2tgCajmGgtRW7wWXr41shNLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cc5hh4qd6z1BMX; Wed, 01 Oct 2025 07:12:04 +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 5917C4hK040891; Wed, 1 Oct 2025 07:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5917C4Wq040888; Wed, 1 Oct 2025 07:12:04 GMT (envelope-from git) Date: Wed, 1 Oct 2025 07:12:04 GMT Message-Id: <202510010712.5917C4Wq040888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 4e0997d1d492 - main - zfs: retire zfs_zstd_compress_wrap 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e0997d1d492eb955bb20a970a7fce189269498c Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4e0997d1d492eb955bb20a970a7fce189269498c commit 4e0997d1d492eb955bb20a970a7fce189269498c Author: Mateusz Guzik AuthorDate: 2025-10-01 07:09:10 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-01 07:09:10 +0000 zfs: retire zfs_zstd_compress_wrap The function is unused, already disappeared upstream and results in compilation warnings. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/contrib/openzfs/module/zstd/zfs_zstd.c | 58 ------------------------------ 1 file changed, 58 deletions(-) diff --git a/sys/contrib/openzfs/module/zstd/zfs_zstd.c b/sys/contrib/openzfs/module/zstd/zfs_zstd.c index 3db196953f74..c403c001086a 100644 --- a/sys/contrib/openzfs/module/zstd/zfs_zstd.c +++ b/sys/contrib/openzfs/module/zstd/zfs_zstd.c @@ -441,64 +441,6 @@ zstd_enum_to_level(enum zio_zstd_levels level, int16_t *zstd_level) } #ifndef IN_LIBSA -static size_t -zfs_zstd_compress_wrap(void *s_start, void *d_start, size_t s_len, size_t d_len, - int level) -{ - int16_t zstd_level; - if (zstd_enum_to_level(level, &zstd_level)) { - ZSTDSTAT_BUMP(zstd_stat_com_inval); - return (s_len); - } - /* - * A zstd early abort heuristic. - * - * - Zeroth, if this is <= zstd-3, or < zstd_abort_size (currently - * 128k), don't try any of this, just go. - * (because experimentally that was a reasonable cutoff for a perf win - * with tiny ratio change) - * - First, we try LZ4 compression, and if it doesn't early abort, we - * jump directly to whatever compression level we intended to try. - * - Second, we try zstd-1 - if that errors out (usually, but not - * exclusively, if it would overflow), we give up early. - * - * If it works, instead we go on and compress anyway. - * - * Why two passes? LZ4 alone gets you a lot of the way, but on highly - * compressible data, it was losing up to 8.5% of the compressed - * savings versus no early abort, and all the zstd-fast levels are - * worse indications on their own than LZ4, and don't improve the LZ4 - * pass noticably if stacked like this. - */ - size_t actual_abort_size = zstd_abort_size; - if (zstd_earlyabort_pass > 0 && zstd_level >= zstd_cutoff_level && - s_len >= actual_abort_size) { - int pass_len = 1; - pass_len = zfs_lz4_compress(s_start, d_start, s_len, d_len, 0); - if (pass_len < d_len) { - ZSTDSTAT_BUMP(zstd_stat_lz4pass_allowed); - goto keep_trying; - } - ZSTDSTAT_BUMP(zstd_stat_lz4pass_rejected); - - pass_len = zfs_zstd_compress(s_start, d_start, s_len, d_len, - ZIO_ZSTD_LEVEL_1); - if (pass_len == s_len || pass_len <= 0 || pass_len > d_len) { - ZSTDSTAT_BUMP(zstd_stat_zstdpass_rejected); - return (s_len); - } - ZSTDSTAT_BUMP(zstd_stat_zstdpass_allowed); - } else { - ZSTDSTAT_BUMP(zstd_stat_passignored); - if (s_len < actual_abort_size) { - ZSTDSTAT_BUMP(zstd_stat_passignored_size); - } - } -keep_trying: - return (zfs_zstd_compress(s_start, d_start, s_len, d_len, level)); - -} - /* Compress block using zstd */ static size_t zfs_zstd_compress_impl(void *s_start, void *d_start, size_t s_len, size_t d_len,