d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: fall back if block_cloning feature is disabled

Browse Source 
If block_cloning is disabled, or other errors from zfs_clone_range()
return an EXDEV we should fall back to vn_generic_copy_file_range().

This fixes issues when copying files on the same dataset with
block_cloning disabled.

Upstreamed as pull request to OpenZFS.

Reviewed by:	Mateusz Guzik <mjguzik@gmail.com>
OpenZFS pull request:	14713
This commit is contained in:
Martin Matuska 2023-04-04 13:40:41 +02:00
parent 76fa62b523
commit 8ee579abe0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -6243,13 +6243,6 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap)
int error;
uint64_t len = *ap->a_lenp;
/*
* TODO: If offset/length is not aligned to recordsize, use
* vn_generic_copy_file_range() on this fragment.
* It would be better to do this after we lock the vnodes, but then we
* need something else than vn_generic_copy_file_range().
*/
/* Lock both vnodes, avoiding risk of deadlock. */
do {
mp = NULL;
@ -6300,6 +6293,16 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap)
if (mp != NULL)
vn_finished_write(mp);
/*
* Fall back if block_cloning feature is disabled
* or other EXDEV failures from zfs_vnops.c
*/
if (error == EXDEV) {
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);
}
return (error);
}