sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

lib/replace: drop runtime copy_file_range() check

Browse Source 
This reverts commit 4354823c5146753ef8a3791bc8562379096659b8
"libreplace: properly execute SYS_copy_file_range check".

We now use a runtime check in the user of copy_file_range().

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Sep  7 19:24:57 UTC 2021 on sn-devel-184
This commit is contained in:
Ralph Boehme 2021-09-05 15:09:12 +02:00 committed by Jeremy Allison
parent 3347bfce9e
commit 2b86cff4a4
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/replace/wscript
View File

@ -456,32 +456,10 @@ def configure(conf):
conf.CHECK_FUNCS('getprogname') conf.CHECK_FUNCS('getprogname')
if not conf.CHECK_FUNCS('copy_file_range'): if not conf.CHECK_FUNCS('copy_file_range'):
conf.CHECK_CODE(''' conf.CHECK_CODE('''
int src_fd = -1, dst_fd = -1, ret; syscall(SYS_copy_file_range,0,NULL,0,NULL,0,0);
ssize_t written;
char src[]="/tmp/test.XXXXXX";
char dst[]="/tmp/test.XXXXXX";
src_fd = mkstemp(src);
if (src_fd == -1) {ret = 1; goto cleanup;}
dst_fd = mkstemp(dst);
if (dst_fd == -1) {ret = 2; goto cleanup;}
written = pwrite(src_fd, "x", 1, 0);
if (written != 1) {ret = 3; goto cleanup;}
written = syscall(SYS_copy_file_range,src_fd,0,dst_fd,0,1,0);
if (written != 1) {
printf("SYS_copy_file_range failed: %s", strerror(errno));
ret = 4; goto cleanup;
}
ret = 0;
cleanup:
if (src_fd != -1) close(src_fd);
if (dst_fd != -1) close(dst_fd);
unlink(src);
unlink(dst);
return ret;
''', ''',
'HAVE_SYSCALL_COPY_FILE_RANGE', 'HAVE_SYSCALL_COPY_FILE_RANGE',
headers='errno.h string.h stdio.h sys/syscall.h unistd.h sys/types.h sys/stat.h fcntl.h', headers='sys/syscall.h unistd.h',
execute=True,
msg='Checking whether we have copy_file_range system call') msg='Checking whether we have copy_file_range system call')
conf.SET_TARGET_TYPE('attr', 'EMPTY') conf.SET_TARGET_TYPE('attr', 'EMPTY')