From nobody Tue Dec 05 00:54:58 2023 X-Original-To: dev-commits-src-branches@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 4Skhry5Hf4z533MB; Tue, 5 Dec 2023 00:54:58 +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 4Skhry4n2mz4g6N; Tue, 5 Dec 2023 00:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; 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=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=SisVe5SAbw6NxOF3EFXoo5k0edvLTkWjykeO9CJt9wHyuDL84PE7WKZrfVVLvFtPBJ3YNG PW0fQys5NktymRn4rsdvX7J6YRXRyZHZBIH/n9B+D6WOm2ucCsvq+hAzeF5PipiFBlDzOD jjWD7Nw2arwYlcGlTnsBsNql/W30otfhf1wGZdM2FiApJCzFyy2dYHKX2JB90mU52pULRI epdqdm64WwfflFiIydsrQNiwDPDNMGSNR16em82ic27SiV4W4fGjyTx89QwYaKI5YH+nsa RGxyjN96q3040sftEHzpMch/1akDD0lRVUljmm2zWz75MlJg20PSNYwowWph6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737698; 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=5BDOnJjWqWBvwzWkSXIMmsTRmtLN35CAiH8bsDT/AOw=; b=vOmO4rFNbZYGj2OD8bYZfIlIqy3UOBiDipx4w1m/Jt1Gg9lz/0u3HD7WQDtjWPIF9uuz7Z B1YKA1fTAS56WyKeMnttDDR0ttmg0lEXiQcVMmanNMOWQBZ874Y/XO2PZIPWg9L2qv/8WQ 6Af7DFDV30ovpLlgMrdH8248FbIi4RNHsvkZF2gaeaxPsVuOkjaVs7es2TP3IsqoIWMXJR +FRTpX4Je6W21D8/El9V6D9qPJ8QULMkypmh7owp+CG7BFSI/dHM0+KeCYkSlufoWpIucY PgI9V8/QhJefydgTLc42U4EL64gpv4WtQAE8OxJ46j5EI9SouXqZxrhGSCb1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737698; a=rsa-sha256; cv=none; b=Sgx/7+Ebl2cpgpmBFrbWWZ1iAcU8dXyuTOgkTrAdE7LYgHINqVSxku4P+5li8LeWrbSXVp 5eh/7sO8XJijVix5/PzYReU1b/RxG3yUhTIFBkZzDiUMx1162ILgtlCns+J6aRAox2gXUI k7MiqruTsR6D9xu71JeCeAn54NS1qbQ/pCrWqrnlaQLQvyireRRjt+lYqP48fd+3D6w9im Z9Ud/7pGT+BqKTZ/N8udwv0Veqd0HXbMIhThNEsmTfpdHwiYqbIfxd3OxDwzMLbYfP1TSW rd2cFt7OcvTKyCV+0gWjADQQ7UXFBaMKHAB7/pEU63S3VH5GgdzjBtOnXCJaBg== 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 4Skhry3tQPzpQB; Tue, 5 Dec 2023 00:54:58 +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 3B50swAm046846; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50swn5046843; Tue, 5 Dec 2023 00:54:58 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:54:58 GMT Message-Id: <202312050054.3B50swn5046843@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: 6c23d1fbeaa4 - stable/13 - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c23d1fbeaa44f1cc4695d0a53f31b3734446730 commit 6c23d1fbeaa44f1cc4695d0a53f31b3734446730 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:44:13 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() (cherry picked from commit c5405d1c850765d04f74067ebb71f57e9a26b8ea) --- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 6871461d26f1..6de23cf71cf3 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -862,6 +862,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -944,13 +945,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 3e9daad09706..02449e64e508 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3813,9 +3813,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) /* NFSv4.2 Copy is not permitted for infile == outfile. */ if (invp == outvp) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e37518ebaaa1..e720ef151c9e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3099,6 +3099,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp);