Date: Thu, 2 Feb 2023 22:26:30 GMT From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cf93505e8de4 - main - tarfs: Fix non-ZSTDIO build. Message-ID: <202302022226.312MQUeV034675@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cf93505e8de402c6ebefed61299a5f40d59ec550 commit cf93505e8de402c6ebefed61299a5f40d59ec550 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-02-02 22:23:52 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302022226.312MQUeV034675>