TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-08-03 18:05:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from thiell/sendfile-minorfix

Browse Source 
copyup: minor fixes for sendfile()
This commit is contained in:
Giuseppe Scrivano 2019-05-06 14:51:05 +02:00 committed by GitHub
commit 89bd69ba91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.c
View File

@ -2093,13 +2093,14 @@ copyup (struct ovl_data *lo, struct ovl_node *node)
while (copied < st.st_size) while (copied < st.st_size)
{ {
off_t tocopy = st.st_size - copied; off_t tocopy = st.st_size - copied;
ssize_t n = sendfile (dfd, sfd, NULL, tocopy > SIZE_MAX ? SIZE_MAX : (size_t) tocopy); ssize_t n = TEMP_FAILURE_RETRY (sendfile (dfd, sfd, NULL, tocopy > SIZE_MAX ? SIZE_MAX : (size_t) tocopy));
if (n < 0) if (n < 0)
{ {
/* On failure, fallback to the read/write loop. */ /* On failure, fallback to the read/write loop. */
ret = copy_fd_to_fd (sfd, dfd, buf, buf_size); ret = copy_fd_to_fd (sfd, dfd, buf, buf_size);
if (ret < 0) if (ret < 0)
goto exit; goto exit;
break;
} }
copied += n; copied += n;
} }