From nobody Mon Nov 20 01:41:43 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 4SYVbq4tTVz51gLK; Mon, 20 Nov 2023 01:41:43 +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 4SYVbq473cz4Fn7; Mon, 20 Nov 2023 01:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444503; 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=NkR0HRGPyCByOOWCE8yIafofZqOEuWFp4Fe0CjlKXzU=; b=vvYeRJhTtRrFYex/RzqEglH4eSXWGovi+cJsRuw4cIkibMXdP96i3D6phq9Jpa751bw1yE gDKUXWZPMK+kb2wozb2z41DCKTIT+G3MR/cEvH5YGUKCKtA8fnXe72kMITmLW/vOGwKVbc QAbJ51bt29FL1EBvA72NrXSZmZBaoO6V6o3H1oJHc9AW3+Jds0rLFf1+WXjrca8r18oLhN 8dmd4CbgaSsTQ7InBlFc/NvX+FiXEoM6QZOh0HDCuG7IeH0zVjz1FAsEWhBkvuJS9i/1Uz VnjLlLjJBoUC1SVpfx4JE9TSqMBx8eTPAkO68G8uSxETZR0DZUG/W9dbSSi7qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444503; 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=NkR0HRGPyCByOOWCE8yIafofZqOEuWFp4Fe0CjlKXzU=; b=A2ookuJc7dm9sLmS1pZYA7odqU3fzLNcvptdND8x49oSUTHmd2HsbiBuIYYFMshfA5huhz IXjYz5eaaDuXWfMrZ552qIN0LwUdxw+eiNF6cgZopEvYOF1AVVheFE0RIs+fP4QH6B0r7b wNZMFPxsnS0FN2MeEeVND7QjZyiotF63SW1TQbsRZvYPsFhbmmaC7qlsy1EhU3TK6TBtq8 K8oTM9Y0A99KlBPzm78OKmzMVhmNSiW05N0H3MRdLHpp8prJXbI1iLCM+C1wQt25+z2GI7 ObtcZOw74ZLgyqGdyw+ka1XNRqmbZZg00QZ6L/y5Ec8dpNgZbCFz19u8V2b54w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700444503; a=rsa-sha256; cv=none; b=S8rbAxp+ieVrQ+apHWRnKr8YQ6G7Af9LauHm+bXiVd1BgNh9DdQwPJ7hJRTRZujVYAy9Uv ihRzqlqw8X6NQ6spLc17m+VMlLElROzoC2+HaViP5GKafNcpn2wZQteqFpw357zocjAlBa WK1bO+LM1X3o3wrXR2vEOtZErHCmH3i+0d4CCwdkPyiGMluihgd7vSAHM+Evxb7LyCVefI WF1LaeKsQDgy1jQU47d8038dxhJ0h7fITZ3SJWKs8hZmVoQBdhSWyCs4L+FZRTdBT8Fyif ysGHYCizvS2zZRxGZ2a+SncXlQFOptNouLOrf0yduUPt9xF0zYyiUF9ARNyn4w== 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 4SYVbq39mkzY3n; Mon, 20 Nov 2023 01:41:43 +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 3AK1fhVq050203; Mon, 20 Nov 2023 01:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK1fhbB050191; Mon, 20 Nov 2023 01:41:43 GMT (envelope-from git) Date: Mon, 20 Nov 2023 01:41:43 GMT Message-Id: <202311200141.3AK1fhbB050191@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: 02c8fefba6b1 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 02c8fefba6b1be95cd738694a616454251a7c709 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=02c8fefba6b1be95cd738694a616454251a7c709 commit 02c8fefba6b1be95cd738694a616454251a7c709 Author: Konstantin Belousov AuthorDate: 2023-11-12 18:29:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 01:40:34 +0000 vn_copy_file_range(): use local variables for invp/outvp vnodes v_mounts (cherry picked from commit 89188bd6ba8d8332c65498f2b71c90e5ed4b9dae) --- sys/kern/vfs_vnops.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index dd3370bc33bb..5194d708f250 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3026,6 +3026,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; @@ -3055,13 +3056,16 @@ 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 vnode are for the same file system, call * VOP_COPY_FILE_RANGE(), otherwise call vn_generic_copy_file_range() * which can handle copies across multiple file systems. */ *lenp = len; - if (invp->v_mount == outvp->v_mount) + if (inmp == outmp) error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, lenp, flags, incred, outcred, fsize_td); else