From nobody Wed Mar 18 14:43:33 2026 X-Original-To: dev-commits-src-branches@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 4fbWmC0SWsz6Vty7 for ; Wed, 18 Mar 2026 14:43:39 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fbWmB6wT8z3lyB for ; Wed, 18 Mar 2026 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773845019; 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=OLMttQgsIKiPD8jlw3URCNkJ8c7jx1zDbrq9/2udWpE=; b=hy086Ju6CVlZ+IXzS7gEzbiPb+2aKeNBZdBvqGBckoZi2wJ9KA6AOtjf9UnnEILhEHECQu /Wm0dtWTvkc37oK19yYsU0oUK+HRnp/QRkLiisA77MEApHBZZLzWuMKwx3GT5N0YlPYVNy q5qYyU9JcJKqLzUZ7myonB8rq/6g8giOmip6wNelDp3zH4Ez09YPqs0GondfGEIRXP4jOp top28EIhnEA2xm3UEl4cwUy+zI8cX7C0G2Gy81tLff/FAZRDrQo0kZ87O5KNdowE7saA/5 X2dteRlR4iy43eWLKPboczqTqQFalAC0T7PA4U2nt7FLp+wTbcEqUGI0YjBuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773845019; a=rsa-sha256; cv=none; b=cO8sdX6XxWqceczMZQNWxxNElXkixl7M3QOsbcXctQ5sbCzhsGdxVQoxmXklZ3mlwg5Ejd Me7bzpYiBzLcBzO9CxWbUyPj8/svoZBDtMxV5NiOa/cVKsdJVeoNAoLf7fVNHcCgb3oB+r t6Ts2E94S3rOkjscUkD/S3oHelGH/bfX7Uem7CKj3tpFGFppEMZRE2KSXGvjxg6sLoAlox o7Bb40NhKOGledh0jmUJPAUrPn3Opl0/qfOLDcfrgSsNKE+28iVqCfaVYow2xoxOkH4R3Z WX4PeiLhFQNx9NBsn/YctA7rRzuvhn7RMp/rAz+5N++a9vkClY74qGG7nUiWfg== 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=1773845019; 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=OLMttQgsIKiPD8jlw3URCNkJ8c7jx1zDbrq9/2udWpE=; b=sWSICO7QJK8wv+bO4o1DHCd/xQKJPD6kdJvPuFANxOqU9k6pt/npeMiveL3c+zosrtUp91 NG3RyPpnso7O41i16wzlgyppEk6VbF8sE0OTGnq40J5HAmrHyf3AX59C0lXijWzghZBS4Y Fx3aiAHFkftZcH84ubFkO0E68qGNs28hyQXUuS8UYG54UIZ3kWV2s+aK4P8tR7/GldRtHD MckL9rN99EEhANeH+P4Vku9JLaodHzeeLQyEarxg6IpNmOOxt7bqjcpVBsnPv5C1Av8oRy 5quenZ/CXbL3m8pp0YV89iN5N+81WopcIbzYG3D6WZPzxPdoDczahcqdLUSWLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbWmB6T7kz1C17 for ; Wed, 18 Mar 2026 14:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42921 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 14:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: b0b6364eadf4 - stable/14 - tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0b6364eadf498c985f8312195e37eed5780347c Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 14:43:33 +0000 Message-Id: <69baba15.42921.40bc405e@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=b0b6364eadf498c985f8312195e37eed5780347c commit b0b6364eadf498c985f8312195e37eed5780347c Author: Siva Mahadevan AuthorDate: 2026-03-14 03:54:46 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-18 14:15:47 +0000 tarfs: swap deprecated ZSTD_resetDStream() with ZSTD_DCtx_reset() ZSTD_resetDStream() is deprecated since 1.5.4: https://github.com/facebook/zstd/commit/5d8cfa6b96a6442ab1251f9de3b47a0eb12561a0 This change is needed to MFV zstd 1.5.7. Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55835 (cherry picked from commit 922d73540d2d9897e5e8160c445cefa13581564e) --- sys/fs/tarfs/tarfs_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index e250c5cbce5a..0eff12c21d3f 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -355,7 +355,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) if (reset) { zio->ipos = zio->idx[zio->curidx].i; zio->opos = zio->idx[zio->curidx].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); TARFS_DPF(ZIDX, "%s: skipping to index %u = i %zu o %zu\n", __func__, zio->curidx, (size_t)zio->ipos, (size_t)zio->opos); } else { @@ -511,7 +511,7 @@ fail_unlocked: zio->curidx = 0; zio->ipos = zio->idx[0].i; zio->opos = zio->idx[0].o; - ZSTD_resetDStream(zstd->zds); + ZSTD_DCtx_reset(zstd->zds, ZSTD_reset_session_only); } return (error); }