Adds mnt_mtx

Author: ultimaweapon

kernel-1100/src/mount.rs

@@ -1,24 +1,31 @@
+use crate::lock::Mtx;
+use crate::Kernel;
 use okf::queue::TailQueueEntry;
 
 /// Implementation of [`okf::mount::Mount`] for 11.00.
 #[repr(C)]
 pub struct Mount {
-    pad1: [u8; 0x28],
+    mtx: Mtx,
+    pad1: [u8; 0x8],
     entry: TailQueueEntry<Self>,
     pad2: [u8; 0x48],
     flags: u64,
 }
 
-impl okf::mount::Mount for Mount {
-    fn entry(&self) -> &TailQueueEntry<Self> {
+impl okf::mount::Mount<Kernel> for Mount {
+    fn mtx(&self) -> *mut Mtx {
+        &self.mtx as *const Mtx as *mut Mtx
+    }
+
+    unsafe fn entry(&self) -> &TailQueueEntry<Self> {
         &self.entry
     }
 
-    fn entry_mut(&mut self) -> &mut TailQueueEntry<Self> {
+    unsafe fn entry_mut(&mut self) -> &mut TailQueueEntry<Self> {
         &mut self.entry
     }
 
-    fn flags(&self) -> u64 {
+    unsafe fn flags(&self) -> u64 {
         self.flags
     }
 }

src/lib.rs

@@ -55,7 +55,7 @@ pub trait Kernel: MappedKernel {
     type File: File;
     type LockObject: LockObject;
     type Malloc: Malloc;
-    type Mount: Mount;
+    type Mount: Mount<Self>;
     type Mtx: Mtx<Self>;
     type Pcpu: Pcpu<Self>;
     type Socket: Socket;

src/mount/mod.rs

@@ -1,13 +1,26 @@
 use crate::queue::TailQueueEntry;
+use crate::Kernel;
 
 /// Represents `mount` structure.
-pub trait Mount: Sized {
+pub trait Mount<K: Kernel>: Sized {
+    /// Returns `mnt_mtx`.
+    fn mtx(&self) -> *mut K::Mtx;
+
     /// Returns `mnt_list`.
-    fn entry(&self) -> &TailQueueEntry<Self>;
+    ///
+    /// # Safety
+    /// [`Kernel::MOUNTLIST_MTX`] must be locked.
+    unsafe fn entry(&self) -> &TailQueueEntry<Self>;
 
     /// Returns mutable `mnt_list`.
-    fn entry_mut(&mut self) -> &mut TailQueueEntry<Self>;
+    ///
+    /// # Safety
+    /// [`Kernel::MOUNTLIST_MTX`] must be locked.
+    unsafe fn entry_mut(&mut self) -> &mut TailQueueEntry<Self>;
 
     /// Returns the value of `mnt_flag`.
-    fn flags(&self) -> u64;
+    ///
+    /// # Safety
+    /// [`Mount::mtx()`] must be locked.
+    unsafe fn flags(&self) -> u64;
 }