The sendfile *offset parameter refers to the input file offest, so it cannot be used in the same way as the copy_file_range *off_out parameter. Therefore, add sf_wrapper function which implements the *off_out behavior for sendfile.
Bug: https://bugs.gentoo.org/635126 --- src/portage_util_file_copy_reflink_linux.c | 34 ++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c index 4be9e0568..5bfa1cd8f 100644 --- a/src/portage_util_file_copy_reflink_linux.c +++ b/src/portage_util_file_copy_reflink_linux.c @@ -56,7 +56,7 @@ initreflink_linux(void) /** * cfr_wrapper - A copy_file_range syscall wrapper function, having a - * function signature that is compatible with sendfile. + * function signature that is compatible with sf_wrapper. * @fd_out: output file descriptor * @fd_in: input file descriptor * @off_out: offset of the output file @@ -79,6 +79,28 @@ cfr_wrapper(int fd_out, int fd_in, off_t *off_out, size_t len) } /** + * sf_wrapper - A sendfile wrapper function, having a function signature + * that is compatible with cfr_wrapper. + * @fd_out: output file descriptor + * @fd_in: input file descriptor + * @off_out: offset of the output file + * @len: number of bytes to copy between the file descriptors + * + * Return: Number of bytes written to out_fd on success, -1 on failure + * (errno is set appropriately). + */ +static ssize_t +sf_wrapper(int fd_out, int fd_in, off_t *off_out, size_t len) +{ + ssize_t ret; + ret = sendfile(fd_out, fd_in, NULL, len); + if (ret > 0) + (*off_out) += ret; + return ret; +} + + +/** * do_lseek_data - Adjust file offsets to the next location containing * data, creating sparse empty blocks in the output file as needed. * @fd_in: input file descriptor @@ -250,7 +272,7 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args) * syscall is not available (less than Linux 4.5). */ error = 0; - copyfunc = sendfile; + copyfunc = sf_wrapper; copyfunc_ret = copyfunc(fd_out, fd_in, &offset_out, @@ -293,10 +315,10 @@ _reflink_linux_file_copy(PyObject *self, PyObject *args) error = errno; } else { while (offset_out < stat_in.st_size) { - copyfunc_ret = sendfile(fd_out, - fd_in, - &offset_out, - stat_in.st_size - offset_out); + copyfunc_ret = sf_wrapper(fd_out, + fd_in, + &offset_out, + stat_in.st_size - offset_out); if (copyfunc_ret < 0) { error = errno; -- 2.13.5
