From nobody Mon Nov 20 01:40:21 2023 X-Original-To: dev-commits-src-all@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 4SYVZG2BWBz51gFR; Mon, 20 Nov 2023 01:40:22 +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 4SYVZG09s9z4Dbs; Mon, 20 Nov 2023 01:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444422; 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=TabtRCP+ZfRV0Ox03fZpCOyLFfmIVNYtVBeoj/uP/Z8=; b=pUdKKMPr83Mq2RPXJ5Nk43K9h6Q2ydZ8j14WMAie7Y/mk5F+1LhTQwICKRe+RMAnjkdeuw Lqxn6DDknql3/TyiV4E3/j8GEQJQtNoAFA3pp+wM4j8r4fwn9gt3fJGoR6mOg8gbuE5/QP Pdm2KyHV/iZHfQuwssh0XhNMEvlrVKgLpxX+2SlRiYmEo1/d2b/6xMoT19AtIKwx28AIeV qep1n9b5Gpy2BNKztjXXLmplF1XDphNVShk68GvEeRVMKliNg7DVMkhffmYUcj2ockxZxm M+QmMDfJCheuyMEQ9+I+hxC7tF8klwV2hGeMptAPpcbmGEhMDejtbXdKOvKD2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444422; 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=TabtRCP+ZfRV0Ox03fZpCOyLFfmIVNYtVBeoj/uP/Z8=; b=PXMNlbfxfY+BUKusoF0OfXaNeE4bvOr+qWza/KN0F6tg0RV5UzFZusjM/xk7d/2Dq95El/ GrKuLIb6acAf03XDIUDVOKOHZn8Zy9PQhke0O04hgfTyFvsgrMl3IbqxNtC1xxNWtqweeZ af8qEgHCz+l2DL/Yfmgpmik2gqNgOIv1dVLxqlHkVc1Lj1iOgTppdynT1mUev8xn68a5mT Q+t+nX4aCmjnsMVYnpLjCrN8RNYELounV1Tht1NAVmkefDUccMKGP7sJEoS+QpoBGkR84n UZrge+O+IIadpNp9lIBv2mQFALCG2CwdE3MV7nF3aduh7ADV0LcCO/ouoPrznA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700444422; a=rsa-sha256; cv=none; b=SPqChkmofRRpcJdeRiqMHknlAsQbCn47aPBAAh8l8WxmZnYhH61OqW1KtzatyKP8eubynh Rps9OiNJ3KDseBqNNcvRP0sbAbKueotx8gyLK9l6D6HUSwelafBsRIozxUUyMYA0LUUXHL U0bLk00JPz9vheOk4IMQWlmsQyMRR5BmZ9z0qXffivsVc+Tmo5br7oCYOdHDvBMdarh03w VrqPPp3HbhVlnLlAxugIBrlZbbOY/ZIiV9dW2ps/PckG558nxBAzRDxLxfFBWwiBW1/NZL Al5KOGByb4PiWvZA2kpzAgJZQvK6mcvXt6Yhw/xRfb7eWtTbN7dT1ustnBv0rw== 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 4SYVZF6MttzY5y; Mon, 20 Nov 2023 01:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AK1eLdY044400; Mon, 20 Nov 2023 01:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK1eLpo044397; Mon, 20 Nov 2023 01:40:21 GMT (envelope-from git) Date: Mon, 20 Nov 2023 01:40:21 GMT Message-Id: <202311200140.3AK1eLpo044397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1703a823c5f8 - stable/14 - vn_copy_file_range(): use local variables for invp/outvp vnodes v_mounts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1703a823c5f827f9690a6baa0f7293a9fe0585ad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1703a823c5f827f9690a6baa0f7293a9fe0585ad commit 1703a823c5f827f9690a6baa0f7293a9fe0585ad Author: Konstantin Belousov AuthorDate: 2023-11-12 18:29:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 01:39:22 +0000 vn_copy_file_range(): use local variables for invp/outvp vnodes v_mounts (cherry picked from commit 89188bd6ba8d8332c65498f2b71c90e5ed4b9dae) --- sys/kern/vfs_vnops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4e4161ef1a7f..e2227537dde1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3046,6 +3046,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, off_t *outoffp, size_t *lenp, unsigned int flags, struct ucred *incred, struct ucred *outcred, struct thread *fsize_td) { + struct mount *inmp, *outmp; int error; size_t len; uint64_t uval; @@ -3075,15 +3076,17 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; + inmp = invp->v_mount; + outmp = outvp->v_mount; + /* * If the two vnodes are for the same file system type, call * VOP_COPY_FILE_RANGE(), otherwise call vn_generic_copy_file_range() * which can handle copies across multiple file system types. */ *lenp = len; - if (invp->v_mount == outvp->v_mount || - strcmp(invp->v_mount->mnt_vfc->vfc_name, - outvp->v_mount->mnt_vfc->vfc_name) == 0) + if (inmp == outmp || strcmp(inmp->mnt_vfc->vfc_name, + outmp->mnt_vfc->vfc_name) == 0) error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, lenp, flags, incred, outcred, fsize_td); else