From 91e03758ded5dbaf7a5a6247c3eb61a07c95494d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 20 Jun 2023 09:37:24 +0000 Subject: [PATCH] tarfs: Don't use IO_DIRECT when reading from tarball. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40612 --- sys/fs/tarfs/tarfs_io.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index 58f3e7eab03f..a3d8df62d7df 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -125,8 +125,7 @@ tarfs_io_read(struct tarfs_mount *tmp, bool raw, struct uio *uiop) rl = vn_rangelock_rlock(tmp->vp, off, off + len); error = vn_lock(tmp->vp, LK_SHARED); if (error == 0) { - error = VOP_READ(tmp->vp, uiop, - IO_DIRECT|IO_NODELOCKED, + error = VOP_READ(tmp->vp, uiop, IO_NODELOCKED, uiop->uio_td->td_ucred); VOP_UNLOCK(tmp->vp); } @@ -426,8 +425,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) auio.uio_rw = UIO_READ; auio.uio_resid = aiov.iov_len; auio.uio_td = td; - error = VOP_READ(tmp->vp, &auio, - IO_DIRECT | IO_NODELOCKED, + error = VOP_READ(tmp->vp, &auio, IO_NODELOCKED, td->td_ucred); if (error != 0) goto fail;