diff options
| author | Ralph Boehme <slow@samba.org> | 2021-09-05 15:09:12 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-09-07 19:24:57 +0000 |
| commit | 2b86cff4a4df81e37ca9a4d95b8b928b0a912633 (patch) | |
| tree | f78d336eb9f3b70dd344da9a5ab172a92f7d98e7 /lib/replace | |
| parent | 3347bfce9ee8b20c09dec2c0c5eb69b0c4bdb743 (diff) | |
| download | samba-2b86cff4a4df81e37ca9a4d95b8b928b0a912633.tar.gz | |
lib/replace: drop runtime copy_file_range() check
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
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/wscript | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index a734d478582..8c69a0c2c39 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -456,32 +456,10 @@ def configure(conf): conf.CHECK_FUNCS('getprogname') if not conf.CHECK_FUNCS('copy_file_range'): conf.CHECK_CODE(''' - int src_fd = -1, dst_fd = -1, ret; - 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; +syscall(SYS_copy_file_range,0,NULL,0,NULL,0,0); ''', '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', - execute=True, + headers='sys/syscall.h unistd.h', msg='Checking whether we have copy_file_range system call') conf.SET_TARGET_TYPE('attr', 'EMPTY') |