Use linux-raw-sys for io-uring type definitions

These definitions are not provided on musl by the libc crate, and since
they are defined in kernel headers, we can just use linux-raw-sys on all
targets.

Signed-off-by: Jens Reidel <[email protected]>

Author: Gelbpunkt

Cargo.toml

@@ -20,6 +20,7 @@ keywords = ["async", "fs", "io-uring"]
 tokio = { version = "1.2", features = ["net", "rt", "sync"] }
 slab = "0.4.2"
 libc = "0.2.80"
+linux-raw-sys = "0.6"
 io-uring = "0.6.0"
 socket2 = { version = "0.4.4", features = ["all"] }
 bytes = { version = "1.0", optional = true }

src/fs/create_dir_all.rs

@@ -193,7 +193,11 @@ mod fs_imp {
 // Uses one asynchronous uring call to determine this.
 async fn is_dir<P: AsRef<Path>>(path: P) -> bool {
     let mut builder = crate::fs::StatxBuilder::new();
-    if builder.mask(libc::STATX_TYPE).pathname(path).is_err() {
+    if builder
+        .mask(linux_raw_sys::general::STATX_TYPE)
+        .pathname(path)
+        .is_err()
+    {
         return false;
     }
 

src/fs/statx.rs

@@ -28,9 +28,9 @@ impl File {
     ///     f.close().await.unwrap();
     /// })
     /// ```
-    pub async fn statx(&self) -> io::Result<libc::statx> {
+    pub async fn statx(&self) -> io::Result<linux_raw_sys::general::statx> {
         let flags = libc::AT_EMPTY_PATH;
-        let mask = libc::STATX_ALL;
+        let mask = linux_raw_sys::general::STATX_ALL;
         Op::statx(Some(self.fd.clone()), None, flags, mask)?.await
     }
 
@@ -73,7 +73,7 @@ impl File {
             file: Some(self.fd.clone()),
             path: None,
             flags: libc::AT_EMPTY_PATH,
-            mask: libc::STATX_ALL,
+            mask: linux_raw_sys::general::STATX_ALL,
         }
     }
 }
@@ -102,7 +102,7 @@ impl File {
 ///     let statx = tokio_uring::fs::statx("foo.txt").await.unwrap();
 /// })
 /// ```
-pub async fn statx<P: AsRef<Path>>(path: P) -> io::Result<libc::statx> {
+pub async fn statx<P: AsRef<Path>>(path: P) -> io::Result<linux_raw_sys::general::statx> {
     StatxBuilder::new().pathname(path).unwrap().statx().await
 }
 
@@ -162,7 +162,7 @@ impl StatxBuilder {
             file: None,
             path: None,
             flags: libc::AT_EMPTY_PATH,
-            mask: libc::STATX_ALL,
+            mask: linux_raw_sys::general::STATX_ALL,
         }
     }
 
@@ -288,7 +288,7 @@ impl StatxBuilder {
     ///     dir.close().await.unwrap();
     /// })
     /// ```
-    pub async fn statx(&mut self) -> io::Result<libc::statx> {
+    pub async fn statx(&mut self) -> io::Result<linux_raw_sys::general::statx> {
         // TODO should the statx() terminator be renamed to something like submit()?
         let fd = self.file.take();
         let path = self.path.take();
@@ -303,7 +303,11 @@ impl StatxBuilder {
 #[allow(dead_code)]
 pub async fn is_dir_regfile<P: AsRef<Path>>(path: P) -> (bool, bool) {
     let mut builder = crate::fs::StatxBuilder::new();
-    if builder.mask(libc::STATX_TYPE).pathname(path).is_err() {
+    if builder
+        .mask(linux_raw_sys::general::STATX_TYPE)
+        .pathname(path)
+        .is_err()
+    {
         return (false, false);
     }
 

src/io/statx.rs

@@ -18,7 +18,7 @@ pub(crate) struct Statx {
 
     // TODO consider returning this type when the operation is complete so the caller has the boxed value.
     // The builder could even recycle an old boxed value and pass it in here.
-    statx: Box<libc::statx>,
+    statx: Box<linux_raw_sys::general::statx>,
 }
 
 impl Op<Statx> {
@@ -53,7 +53,8 @@ impl Op<Statx> {
                     opcode::Statx::new(
                         types::Fd(raw),
                         statx.path.as_ptr(),
-                        &mut *statx.statx as *mut libc::statx as *mut types::statx,
+                        &mut *statx.statx as *mut linux_raw_sys::general::statx
+                            as *mut types::statx,
                     )
                     .flags(flags)
                     .mask(mask)
@@ -65,7 +66,7 @@ impl Op<Statx> {
 }
 
 impl Completable for Statx {
-    type Output = io::Result<libc::statx>;
+    type Output = io::Result<linux_raw_sys::general::statx>;
 
     fn complete(self, cqe: CqeResult) -> Self::Output {
         cqe.result?;