fix puzzlefs_dependencies_v2 branch for 6.6.0-rc4

https://github.com/ariel-miculas/linux/tree/puzzlefs_dependencies_v2

Author: gurugio

rust/bindings/bindings_helper.h

@@ -18,6 +18,7 @@
 #include <linux/poll.h>
 #include <linux/uio.h>
 #include <linux/uaccess.h>
+#include <linux/delay.h>
 
 /* `bindgen` gets confused at certain things. */
 const size_t BINDINGS_ARCH_SLAB_MINALIGN = ARCH_SLAB_MINALIGN;

rust/kernel/delay.rs

@@ -10,7 +10,7 @@ use core::{cmp::min, time::Duration};
 const MILLIS_PER_SEC: u64 = 1_000;
 
 fn coarse_sleep_conversion(duration: Duration) -> core::ffi::c_uint {
-    let milli_as_nanos = Duration::MILLISECOND.subsec_nanos();
+    let milli_as_nanos = Duration::from_millis(1).subsec_nanos();
 
     // Rounds the nanosecond component of `duration` up to the nearest millisecond.
     let nanos_as_millis = duration.subsec_nanos().wrapping_add(milli_as_nanos - 1) / milli_as_nanos;

rust/kernel/file.rs

@@ -616,7 +616,6 @@ impl<A: OpenAdapter<T::OpenData>, T: Operations> OperationsVtable<A, T> {
             None
         },
         get_unmapped_area: None,
-        iterate: None,
         iterate_shared: None,
         iopoll: None,
         lock: None,
@@ -654,6 +653,7 @@ impl<A: OpenAdapter<T::OpenData>, T: Operations> OperationsVtable<A, T> {
         } else {
             None
         },
+        uring_cmd_iopoll: None,
     };
 
     /// Builds an instance of [`struct file_operations`].

rust/kernel/fs.rs

@@ -227,7 +227,7 @@ impl<T: Type + ?Sized> Tables<T> {
             Super::SingleReconf => unsafe {
                 // SAFETY: `fc` is valid per the callback contract. `fill_super_callback` also has
                 // the right type and is a valid callback.
-                bindings::get_tree_single_reconf(fc, Some(Self::fill_super_callback))
+                bindings::get_tree_single(fc, Some(Self::fill_super_callback))
             },
             Super::Independent => unsafe {
                 // SAFETY: `fc` is valid per the callback contract. `fill_super_callback` also has
@@ -528,7 +528,7 @@ impl Registration {
                         align_of::<INodeWithData<T::INodeData>>() as _,
                         bindings::SLAB_RECLAIM_ACCOUNT
                             | bindings::SLAB_MEM_SPREAD
-                            | bindings::SLAB_ACCOUNT,
+                            | bindings::BINDINGS_SLAB_ACCOUNT,
                         Some(Self::inode_init_once_callback::<T>),
                     )
                 };
@@ -538,7 +538,7 @@ impl Registration {
             }
         }
 
-        let mut fs = this.fs.get();
+        let fs = this.fs.get();
         // SAFETY: `fs` is valid as it points to the `self.fs`.
         unsafe {
             (*fs).owner = module.0;
@@ -1100,7 +1100,7 @@ impl<T: Type + ?Sized> SuperBlock<T> {
             let time = unsafe { bindings::current_time(&mut outer.inode) };
             outer.inode.i_mtime = time;
             outer.inode.i_atime = time;
-            outer.inode.i_ctime = time;
+            outer.inode.__i_ctime = time;
 
             outer.inode.i_ino = params.ino;
             outer.inode.i_mode = params.mode & 0o777 | mode_type;
@@ -1278,7 +1278,7 @@ pub struct Module<T: Type> {
 }
 
 impl<T: Type + Sync> crate::Module for Module<T> {
-    fn init(_name: &'static CStr, module: &'static ThisModule) -> Result<Self> {
+    fn init(module: &'static ThisModule) -> Result<Self> {
         let mut reg = Pin::from(Box::try_new(Registration::new())?);
         reg.as_mut().register::<T>(module)?;
         Ok(Self {

rust/kernel/types.rs

@@ -37,6 +37,22 @@ pub trait ForeignOwnable: Sized {
     /// which a previous matching [`ForeignOwnable::from_foreign`] hasn't been called yet.
     unsafe fn borrow<'a>(ptr: *const core::ffi::c_void) -> Self::Borrowed<'a>;
 
+    /// Mutably borrows a foreign-owned object.
+    ///
+    /// # Safety
+    ///
+    /// `ptr` must have been returned by a previous call to [`ForeignOwnable::into_foreign`] for
+    /// which a previous matching [`ForeignOwnable::from_foreign`] hasn't been called yet.
+    /// Additionally, all instances (if any) of values returned by [`ForeignOwnable::borrow`] and
+    /// [`ForeignOwnable::borrow_mut`] for this object must have been dropped.
+    unsafe fn borrow_mut(ptr: *const core::ffi::c_void) -> ScopeGuard<Self, fn(Self)> {
+        // SAFETY: The safety requirements ensure that `ptr` came from a previous call to
+        // `into_foreign`.
+        ScopeGuard::new_with_data(unsafe { Self::from_foreign(ptr) }, |d| {
+            d.into_foreign();
+        })
+    }
+
     /// Converts a foreign-owned object back to a Rust-owned one.
     ///
     /// # Safety