upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cp: Fix build without VM_AND_BUFFER_CACHE_SYNCHRONIZED.

Browse source 
It allows to not use mmap() for small files, which is not helpful
in case of ZFS.  Should be no functional change.

MFC after:	1 week
This commit is contained in:
Alexander Motin 2022-08-30 10:51:21 -04:00
parent cbc5350359
commit 35b7759c05
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bin/cp/utils.c
View file

@ -99,13 +99,12 @@ copy_file(const FTSENT *entp, int dne)
static char *buf = NULL;
static size_t bufsize;
struct stat *fs;
ssize_t rcount, wcount;
size_t wresid;
ssize_t wcount;
off_t wtotal;
int ch, checkch, from_fd, rval, to_fd;
char *bufp;
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
char *p;
size_t wresid;
char *bufp, *p;
#endif
int use_copy_file_range = 1;
@ -234,18 +233,18 @@ copy_file(const FTSENT *entp, int dne)
wtotal = 0;
do {
if (use_copy_file_range) {
rcount = copy_file_range(from_fd, NULL,
wcount = copy_file_range(from_fd, NULL,
to_fd, NULL, SSIZE_MAX, 0);
if (rcount < 0 && errno == EINVAL) {
if (wcount < 0 && errno == EINVAL) {
/* Prob a non-seekable FD */
use_copy_file_range = 0;
}
}
if (!use_copy_file_range) {
rcount = copy_fallback(from_fd, to_fd,
wcount = copy_fallback(from_fd, to_fd,
buf, bufsize);
}
wtotal += rcount;
wtotal += wcount;
if (info) {
info = 0;
(void)fprintf(stderr,
@ -253,8 +252,8 @@ copy_file(const FTSENT *entp, int dne)
entp->fts_path, to.p_path,
cp_pct(wtotal, fs->st_size));
}
} while (rcount > 0);
if (rcount < 0) {
} while (wcount > 0);
if (wcount < 0) {
warn("%s", entp->fts_path);
rval = 1;
}