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

Clip the "len" argument to vn_generic_copy_file_range() at a

Browse Source 
hole size boundary.

By clipping the len argument of vn_generic_copy_file_range() to end at
an exact multiple of hole size, holes are more likely to be maintained
during the copy.
A hole can still straddle the boundary at the end of the
copy range, resulting in a block being allocated in the
output file as it is being grown in size, but this will reduce the
likelyhood of this happening.

While here, also modify setting of blksize to better handle the
case where _PC_MIN_HOLE_SIZE is returned as 1.

Reviewed by:	asomers
Differential Revision:	https://reviews.freebsd.org/D26570
This commit is contained in:
Rick Macklem 2020-10-01 00:33:44 +00:00
parent 96128185f6
commit 961afe3c99
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=366302
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_vnops.c
View File

@ -3020,7 +3020,7 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp,
int error;
bool cantseek, readzeros, eof, lastblock;
ssize_t aresid;
size_t copylen, len, savlen;
size_t copylen, len, rem, savlen;
char *dat;
long holein, holeout;
@ -3089,7 +3089,17 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp,
* This value is clipped at 4Kbytes and 1Mbyte.
*/
blksize = MAX(holein, holeout);
if (blksize == 0)
/* Clip len to end at an exact multiple of hole size. */
if (blksize > 1) {
rem = *inoffp % blksize;
if (rem > 0)
rem = blksize - rem;
if (len - rem > blksize)
len = savlen = rounddown(len - rem, blksize) + rem;
}
if (blksize <= 1)
blksize = MAX(invp->v_mount->mnt_stat.f_iosize,
outvp->v_mount->mnt_stat.f_iosize);
if (blksize < 4096)