Merge remote-tracking branch 'upstream/master' into PR_267

Merge an updated verions of tokio-rs#267

Author: ollie-etl

Cargo.toml

@@ -20,7 +20,7 @@ keywords = ["async", "fs", "io-uring"]
 tokio = { version = "1.2", features = ["net", "rt", "sync"] }
 slab = "0.4.2"
 libc = "0.2.80"
-io-uring = "0.5.13"
+io-uring = "0.6.0"
 socket2 = { version = "0.4.4", features = ["all"] }
 bytes = { version = "1.0", optional = true }
 futures-util = { version = "0.3.26", default-features = false, features = ["std"] }

src/buf/fixed/plumbing/registry.rs

@@ -74,7 +74,7 @@ impl<T: IoBufMut> Registry<T> {
     pub(crate) fn check_out(&mut self, index: usize) -> Option<CheckedOutBuf> {
         let state = self.states.get_mut(index)?;
         let BufState::Free { init_len } = *state else {
-            return None
+            return None;
         };
 
         *state = BufState::CheckedOut;

src/io/fallocate.rs

@@ -25,8 +25,8 @@ impl Op<Fallocate> {
             x.handle().expect("not in a runtime context").submit_op(
                 Fallocate { fd: fd.clone() },
                 |fallocate| {
-                    opcode::Fallocate64::new(types::Fd(fallocate.fd.raw_fd()), len as _)
-                        .offset64(offset as _)
+                    opcode::Fallocate::new(types::Fd(fallocate.fd.raw_fd()), len as _)
+                        .offset(offset as _)
                         .mode(flags)
                         .build()
                 },

src/io/write.rs

@@ -53,7 +53,7 @@ impl<T: BoundedBuf> UnsubmittedWrite<T> {
                 buf,
             },
             WriteTransform {
-                _phantom: PhantomData::default(),
+                _phantom: PhantomData,
             },
             opcode::Write::new(types::Fd(fd.raw_fd()), ptr, len as _)
                 .offset(offset as _)

src/io/writev_all.rs

@@ -135,7 +135,7 @@ impl<T: BoundedBuf> Op<WritevAll<T>> {
                 // So this wouldn't need to be a function. Just pass in the entry.
                 |write| {
                     opcode::Writev::new(types::Fd(write.fd.raw_fd()), iovs_ptr, iovs_len)
-                        .offset64(offset as _)
+                        .offset(offset as _)
                         .build()
                 },
             )

src/runtime/driver/mod.rs

@@ -97,9 +97,11 @@ impl Driver {
         &mut self,
         buffers: Rc<RefCell<dyn FixedBuffers>>,
     ) -> io::Result<()> {
-        self.uring
-            .submitter()
-            .register_buffers(buffers.borrow().iovecs())?;
+        unsafe {
+            self.uring
+                .submitter()
+                .register_buffers(buffers.borrow().iovecs())
+        }?;
 
         self.fixed_buffers = Some(buffers);
         Ok(())