Auto merge of #3133 - slp:musl-copy-file-range, r=JohnTitor

linux/musl: add copy_file_range syscall wrapper musl supports copy_file_range since v1.1.24, so expose the corresponding wrapper here too.
rust-lang · Mar 3, 2023 · 837c461 · 837c461
2 parents 6275bac + 19084be
commit 837c461
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/libc-test/semver/linux-musl.txt b/libc-test/semver/linux-musl.txt
@@ -33,6 +33,7 @@ aio_suspend
 aio_write
 aiocb
 clock_adjtime
+copy_file_range
 ctermid
 explicit_bzero
 futimes

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -1212,14 +1212,6 @@ extern "C" {
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
     pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;
 
-    pub fn copy_file_range(
-        fd_in: ::c_int,
-        off_in: *mut ::off64_t,
-        fd_out: ::c_int,
-        off_out: *mut ::off64_t,
-        len: ::size_t,
-        flags: ::c_uint,
-    ) -> ::ssize_t;
     pub fn fanotify_mark(
         fd: ::c_int,
         flags: ::c_uint,

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -4702,6 +4702,15 @@ extern "C" {
         longopts: *const option,
         longindex: *mut ::c_int,
     ) -> ::c_int;
+
+    pub fn copy_file_range(
+        fd_in: ::c_int,
+        off_in: *mut ::off64_t,
+        fd_out: ::c_int,
+        off_out: *mut ::off64_t,
+        len: ::size_t,
+        flags: ::c_uint,
+    ) -> ::ssize_t;
 }
 
 cfg_if! {