git: c5405d1c8507 - main - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range()

[Konstantin Belousov]

The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c5405d1c850765d04f74067ebb71f57e9a26b8ea

commit c5405d1c850765d04f74067ebb71f57e9a26b8ea
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2023-11-18 08:59:19 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2023-11-28 17:32:53 +0000

    vn_copy_file_range(): provide ENOSYS fallback to 
vn_generic_copy_file_range()
    
    Reviewed by:    markj, Olivier Certner <olce.free...@certner.fr>
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D42603
---
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +---
 sys/fs/fuse/fuse_vnops.c                                 | 7 ++-----
 sys/fs/nfsclient/nfs_clvnops.c                           | 4 +---
 sys/kern/vfs_vnops.c                                     | 2 ++
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c 
b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
index 107cd69c756c..ccd708550f5b 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -6321,9 +6321,7 @@ bad_locked_fallback:
 bad_write_fallback:
        if (mp != NULL)
                vn_finished_write(mp);
-       error = 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);
+       error = ENOSYS;
        return (error);
 }
 
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 42ed3e36b946..30965b45215d 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -860,6 +860,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;
 
@@ -942,13 +943,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 00b6c7617101..5c9ca69b5d51 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -3888,9 +3888,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap)
         */
        if (invp == outvp || invp->v_mount != outvp->v_mount) {
 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 29114f795f5e..7fe861ccaee7 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -3142,6 +3142,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);