From nobody Thu Feb 02 22:26:30 2023 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 4P7D0Q6DL9z3kdZd; Thu, 2 Feb 2023 22:26:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P7D0Q5kZHz3KT5; Thu, 2 Feb 2023 22:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675376790; 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=IBpPZ1F2o7OKtfKaDaDPk4oXmxXp9sMlFMIXKJ92qgw=; b=WOZxox/4X0YkEF6l4JA7963indG+DxZWSQzFg5/0PynB4xcRMooTa/QeKS8L1jAapEgErt Z2AnjM6ofVjp588teC7jwSA+3Ml5r8vmZAr/2EpvgArb4Jw8vK+lqBITkhdrUVNC3lwrPs PWTnFNub16qdcXBo+HDjJtGTzXzxxqWW+eHJ/xwZ38m4X42e/FIJWufJMlkMCkMLgqmQKL c09uXUi4ZmkSCdMS1EpAI0pE7pez/YNCY3+hsErrBHUo3maJ16Etssd1I8fhW+C45ypNGk AW0BKyqM0jTaHbes1PaFDZPlRfglURfL1NAaXvoTnXWxmf8lX2qDkC1Cy0mdgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675376790; 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=IBpPZ1F2o7OKtfKaDaDPk4oXmxXp9sMlFMIXKJ92qgw=; b=W/RSttoEQxAWuR2iG6RU6Rw1QnX9LSUWRbtH/K9yRrZ2V417iwkAm7N93d8JmJ8470rxst 04OxrJmGdsJ6vWxv8EqrgkbmKifeqOySv3Td3rzzYjWaXF3ot+kXPT9nvasOV8HCuFQqIA GRS/TLTyx5S2t7FptzuaBIM4OZ4mEadtOxqCpqDCCL1W0h51ZjmI/dcb8HzbeNQ4RLfF3Q Ensy/7LZrIQDQGYA5woI9BqpHR10lKvtaMxJfY+9ZhSwtgCH1W22nB6mOW3zlKQqGH+N5+ b/VuxTZRgWoxEd6ktkA79PAI8/S2RkttTW5OPrI1sFG791KB814b3EKh7wfOuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675376790; a=rsa-sha256; cv=none; b=vSdqxDNpUDAKUYVRNglZJV8SkoVmsNxmR4eDHa8fo3medTNxBWoOsoYgHq1ZdKllwEho70 Ai2xY/KKy+X+vWc0E1bl+W2RurAgugmdQjMNGcT2YowDkbkNjw6qWQXWWRH/LsKekaR6B3 +XVNSxUskW0mzr32tNpx1NZMjR3dI0TzoBSh3DLNrmZTuEZ7mQixmkcT3SGIE40AbBUJfD +6Xd/jcjwjlOaaYoHVQbG2ZA+fvfWca/6kG/X8rLjJqaYr+MknTEDjZg9GG+tS/AK3uvxT +ZDhc7KD+/gYBFtzueww3ghFJan0mBkJMTNxCRitJ0oMMvbc/5QS8zPEttBWuA== 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 4P7D0Q4jSGz19tr; Thu, 2 Feb 2023 22:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 312MQUTT034676; Thu, 2 Feb 2023 22:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312MQUeV034675; Thu, 2 Feb 2023 22:26:30 GMT (envelope-from git) Date: Thu, 2 Feb 2023 22:26:30 GMT Message-Id: <202302022226.312MQUeV034675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: cf93505e8de4 - main - tarfs: Fix non-ZSTDIO build. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf93505e8de402c6ebefed61299a5f40d59ec550 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cf93505e8de402c6ebefed61299a5f40d59ec550 commit cf93505e8de402c6ebefed61299a5f40d59ec550 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-02 22:23:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-02 22:25:34 +0000 tarfs: Fix non-ZSTDIO build. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. --- sys/fs/tarfs/tarfs_io.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index b957ac11ff51..87885fbb329c 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -517,9 +517,11 @@ fail_unlocked: static int tarfs_zread(struct vop_read_args *ap) { +#if defined(TARFS_DEBUG) || defined(ZSTDIO) struct vnode *vp = ap->a_vp; struct tarfs_zio *zio = vp->v_data; struct uio *uiop = ap->a_uio; +#endif #ifdef TARFS_DEBUG off_t off = uiop->uio_offset; size_t len = uiop->uio_resid; @@ -640,7 +642,9 @@ int tarfs_io_init(struct tarfs_mount *tmp) { uint8_t *block; +#ifdef ZSTDIO struct tarfs_zio *zio = NULL; +#endif ssize_t res; int error = 0;