mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
vfs: copy_file_range() between multiple mountpoints of the same fs type
VOP_COPY_FILE_RANGE(9) is now caled when source and target vnodes reside on the same filesystem type (not just on the same mountpoint). The check if vnodes are on the same mountpoint must be done in the filesystem code. There are currently only three users - fusefs(5) already has this check, ZFS can handle multiple mountpoints and a check has been added to NFS client. ZFS block cloning is now possible between all snapshots and datasets of the same ZFS pool. MFC after: 1 week Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41721
This commit is contained in:
parent
bf986d5245
commit
969071be93
|
@ -28,8 +28,8 @@
|
|||
.Os
|
||||
.Sh NAME
|
||||
.Nm VOP_COPY_FILE_RANGE
|
||||
.Nd copy a byte range from one file to another or within one file
|
||||
in a single file system
|
||||
.Nd copy a byte range within a file or from one file to another in a single
|
||||
file system or between multiple file systems
|
||||
.Sh SYNOPSIS
|
||||
.In sys/param.h
|
||||
.In sys/vnode.h
|
||||
|
|
|
@ -3898,8 +3898,11 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap)
|
|||
off_t inoff, outoff;
|
||||
bool consecutive, must_commit, tryoutcred;
|
||||
|
||||
/* NFSv4.2 Copy is not permitted for infile == outfile. */
|
||||
if (invp == outvp) {
|
||||
/*
|
||||
* NFSv4.2 Copy is not permitted for infile == outfile.
|
||||
* TODO: copy_file_range() between multiple NFS mountpoints
|
||||
*/
|
||||
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,
|
||||
|
|
|
@ -3076,12 +3076,14 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp,
|
|||
goto out;
|
||||
|
||||
/*
|
||||
* If the two vnode are for the same file system, call
|
||||
* 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 systems.
|
||||
* which can handle copies across multiple file system types.
|
||||
*/
|
||||
*lenp = len;
|
||||
if (invp->v_mount == outvp->v_mount)
|
||||
if (invp->v_mount == outvp->v_mount ||
|
||||
strcmp(invp->v_mount->mnt_vfc->vfc_name,
|
||||
outvp->v_mount->mnt_vfc->vfc_name) == 0)
|
||||
error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp,
|
||||
lenp, flags, incred, outcred, fsize_td);
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue