From nobody Wed Mar 18 14:21: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 4fbWGj6Pttz6VslL for ; Wed, 18 Mar 2026 14:21:33 +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 4fbWGj5l3Jz3kCZ for ; Wed, 18 Mar 2026 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773843693; 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=w0nFgbtQDrQ7mblB2p2dP2AIfis0qJ0mqTXp6l/QA9Y=; b=tVsQ+mkQdDjOqEFYE1ZDcfZ9xZPplsCBvSP0ynZxolw3k/4vrVXjO1p2f0mysj0my8/Uy5 ktZiSarZHZO1C9EWuqTgN0iJWWP+dMcghH5PnvqRNdiVajM5+gBuyJVIeoTZ2o3hs3LbX7 oquaE1IxHvsZ7AM07pujG4z1c3aZPCPTE1Tc8s5wfqLIUEUUqW6ygoTtfalTB+Xb5iUnFh FYWiaiVkGhnnI5G/Ymv1b62FdZaoPczSa+WIvTmc5rCUi8tfnGnGGXvu5DrA9bL52FdZk3 TJ3Y/v8jRBGDuOQA5/94j4o5uLKtZfxgHZ7KCKRr755ej8i4PL6ysXSJd1fBNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773843693; a=rsa-sha256; cv=none; b=XkF97eh5lSKEp/xAntJbtKzdg4Dr94Hqr29NIl7UJ/iJVu8EJcU2v0AaABxE7GBz49zRfC g3B99xlKPI7ygpXkdrFUcIjJh5jGZbQoXZXpp+i3iTemEmAge6kgbD1cf7s/wmpJNx2QVo JcKSz1gzXdIlbYGVeJUmXNtsgLj1BpycGU2ubvcNwaJl5CK/O/R7anai662a+kGi6LkBm+ ihwrt/ESEvdrRbB8CFtSC5SfI4INEVCZxU561SfA0UU3vjcUphWYX5TPkbiEN7zinHT1Jt FIzRE+OcgNgyegraO9FfX34kcAA2/X8K0oX0j/SAHe1xiMf6wmM2keRMp6b4ow== 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=1773843693; 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=w0nFgbtQDrQ7mblB2p2dP2AIfis0qJ0mqTXp6l/QA9Y=; b=J3N/DF7IrXx+CMZ4IAe3fFi0j9bL5iO2Ert7EwrlcWqm+bPQnucsGC6zrWfpZ/UXzInCci a9VUS0Yk6a2MjaYBJv8M8m4749aSggJ9aF5EXAAdzHYacJcfhMlj3bO1bCdN1YXazMQe+C gXOyPS44BnAwnviayO6dXfg5qybzJYj/2hU3BayOVdtEG5ZbV4B0kr5+a0wUGdeKKOGHMZ 2IwHzXFE11dNLGw3prLkp8YrQWrlk7Oa4MuHDAP20HqCtStzTKFMJoaA7TnNxXwev9lyHB 9UolpFisYwaG/Lg3lurmX1bKPq15K1qUTK3m610L1kEcpdFkDjkZfbw3WggAgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fbWGj5LCFz19nD for ; Wed, 18 Mar 2026 14:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 414dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Mar 2026 14:21:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 317c242462bb - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 317c242462bb3c34452bf61eb7d99b741eb766a6 Auto-Submitted: auto-generated Date: Wed, 18 Mar 2026 14:21:33 +0000 Message-Id: <69bab4ed.414dd.6175c045@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=317c242462bb3c34452bf61eb7d99b741eb766a6 commit 317c242462bb3c34452bf61eb7d99b741eb766a6 Author: Siva Mahadevan AuthorDate: 2026-03-14 03:54:46 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-18 13:49:53 +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); }