From nobody Tue Jun 20 10:02:19 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 4Qlhy36zx0z4dy27; Tue, 20 Jun 2023 10:02:19 +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 4Qlhy368ZBz3P06; Tue, 20 Jun 2023 10:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687255339; 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=+EFmn6wRadOnqQszsc9YGplRWqxOi0PqBAQ0CTIQer8=; b=sSO0asqb4K8G5dxTPEWvFGG5AxmNtpmpIhSvrEC5GXuQhOt4/LYSqH5ZI3ULuDEuAvPuWI g9FgKwvuFUFzyhNRJjwdaN2JlC1aOuHkvHgzyCbzP206CF+p8CFVVJTYUi+S1TKP2IYhU6 lzWnjDXd1zvi9QD3Vpff6vTsiac675lTgvwH+YsRRvq8lTwETdqhx9H81d81oBwdmtZj81 BcC7XxmCzoiEjVak7J9mzacfNWyRR4IgubhmMVzw6yoiJxXqk4zoxXxQzXgTIttmbQSUc4 4tSkpwujmnAze0pCgdCjA+KWFCbHbSx8ZARHCQ1ia4/win4gzWJwbEw0H7yrLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687255339; 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=+EFmn6wRadOnqQszsc9YGplRWqxOi0PqBAQ0CTIQer8=; b=R6ExddxUGqadkN7ntdjrY1wRTs/bHT5fDNIJHEmIK0wVKnCszk2Db1PrYHyu7by7VOMeVo x6z38qtAq5HHfbGcg+Haom7v2RAcpX+q18ElMJb1Kdl+9hpcEQHF53SJiV9KbzvVI0spID Vc7duhDclnASL+PjUl44wnuANjWOJBWMeW/3xT2zAhj4TztLi0acoTKnX0k5samqbozkMk wCKkGXWQDMCUj8iLAXo+x47EOJLXhO7TeDnkvqF+H7BhOxW7TPMkzF4x84+UtVl6zSb3g5 rkfpSFcyZDKYBT7jk+BX5aIEa8sXjJfcnOWBIQu4M5s8W4xVn6OS7GNQ7lUv1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687255339; a=rsa-sha256; cv=none; b=JbiwCqF5v+3b45sSET/ODgjA1F7rflnrhjFxD/LGj84/NyUQDSywNEw0XlV7BT/ihrFeZK nNZ0CvBgIMI38jCwYUIwWqpTEnSV5lIrl2fCU/k+fifZ+6IDQ4V2TgpXdISY8Z/wKWNvea +zMipnFlEjnhpE2hXjWmSENIKpdW97u1A/sgZRPCxw8+SQbAHQIvYn8Y4KQ/ZhA6pqEtvC 1anvw0suAtgCcGNbMW/rgkH86gbe3ucqz7wI8Abu1I+QOe30NTpZlz2GQs1FDxTTAMclh/ 8oADeJSfBrUst4S1PkxHxiqF99yExOhBcQn4e1DHklzQK8ozLaJp8MGyteqmTQ== 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 4Qlhy35DwGzvgN; Tue, 20 Jun 2023 10:02:19 +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 35KA2JBg013251; Tue, 20 Jun 2023 10:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KA2JKu013250; Tue, 20 Jun 2023 10:02:19 GMT (envelope-from git) Date: Tue, 20 Jun 2023 10:02:19 GMT Message-Id: <202306201002.35KA2JKu013250@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: 91e03758ded5 - main - tarfs: Don't use IO_DIRECT when reading from tarball. 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: 91e03758ded5dbaf7a5a6247c3eb61a07c95494d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=91e03758ded5dbaf7a5a6247c3eb61a07c95494d commit 91e03758ded5dbaf7a5a6247c3eb61a07c95494d Author: Dag-Erling Smørgrav AuthorDate: 2023-06-20 09:37:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-20 10:02:10 +0000 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;