Adds mnt_op

Author: ultimaweapon

kernel-1100/src/lib.rs

@@ -3,7 +3,7 @@
 use self::file::File;
 use self::lock::{LockObject, Mtx};
 use self::malloc::Malloc;
-use self::mount::{Filesystem, FsStats, Mount};
+use self::mount::{Filesystem, FsOps, FsStats, Mount};
 use self::pcpu::Pcpu;
 use self::socket::Socket;
 use self::thread::Thread;
@@ -52,6 +52,7 @@ impl okf::Kernel for Kernel {
 
     type File = File;
     type Filesystem = Filesystem;
+    type FsOps = FsOps;
     type FsStats = FsStats;
     type LockObject = LockObject;
     type Malloc = Malloc;

kernel-1100/src/mount.rs

@@ -1,6 +1,9 @@
 use crate::lock::Mtx;
+use crate::vnode::Vnode;
 use crate::Kernel;
-use core::ffi::c_char;
+use core::ffi::{c_char, c_int};
+use core::mem::MaybeUninit;
+use core::num::NonZero;
 use okf::queue::TailQueueEntry;
 
 /// Implementation of [`okf::mount::Mount`] for 11.00.
@@ -9,7 +12,7 @@ pub struct Mount {
     mtx: Mtx,
     pad1: [u8; 0x8],
     entry: TailQueueEntry<Self>,
-    pad2: [u8; 8],
+    ops: *const FsOps,
     fs: *mut Filesystem,
     pad3: [u8; 0x38],
     flags: u64,
@@ -34,6 +37,10 @@ impl okf::mount::Mount<Kernel> for Mount {
         self.fs
     }
 
+    fn ops(&self) -> &'static FsOps {
+        unsafe { &*self.ops }
+    }
+
     unsafe fn flags(&self) -> u64 {
         self.flags
     }
@@ -56,6 +63,25 @@ impl okf::mount::Filesystem for Filesystem {
     }
 }
 
+/// Implementation of [`okf::mount::FsOps`] for 11.00.
+#[repr(C)]
+pub struct FsOps {
+    pad1: [u8; 0x18],
+    root: unsafe extern "C" fn(*mut Mount, c_int, *mut *mut Vnode) -> c_int,
+}
+
+impl okf::mount::FsOps<Kernel> for FsOps {
+    unsafe fn root(&self, mp: *mut Mount, flags: c_int) -> Result<*mut Vnode, NonZero<c_int>> {
+        let mut vp = MaybeUninit::uninit();
+        let errno = (self.root)(mp, flags, vp.as_mut_ptr());
+
+        match NonZero::new(errno) {
+            Some(v) => Err(v),
+            None => Ok(vp.assume_init()),
+        }
+    }
+}
+
 /// Implementation of [`okf::mount::FsStats`] for 11.00.
 #[repr(C)]
 pub struct FsStats {

src/lib.rs

@@ -4,7 +4,7 @@ use self::fd::OpenFlags;
 use self::file::File;
 use self::lock::{LockObject, Mtx};
 use self::malloc::{Malloc, MallocFlags};
-use self::mount::{Filesystem, FsStats, Mount};
+use self::mount::{Filesystem, FsOps, FsStats, Mount};
 use self::pcpu::Pcpu;
 use self::queue::TailQueue;
 use self::socket::{SockAddr, Socket};
@@ -60,6 +60,7 @@ pub trait Kernel: MappedKernel {
 
     type File: File;
     type Filesystem: Filesystem;
+    type FsOps: FsOps<Self>;
     type FsStats: FsStats;
     type LockObject: LockObject;
     type Malloc: Malloc;

src/mount/fs.rs

@@ -1,7 +1,16 @@
-use core::ffi::c_char;
+use crate::Kernel;
+use core::ffi::{c_char, c_int};
+use core::num::NonZero;
 
 /// Represents `vfsconf` structure.
 pub trait Filesystem: Sized {
     /// Returns `vfc_name`.
     fn name(&self) -> *const c_char;
 }
+
+/// Represents `vfsops` structure.
+pub trait FsOps<K: Kernel>: Sized {
+    /// Invoke `vfs_root`.
+    unsafe fn root(&self, mp: *mut K::Mount, flags: c_int)
+        -> Result<*mut K::Vnode, NonZero<c_int>>;
+}

src/mount/mod.rs

@@ -26,6 +26,9 @@ pub trait Mount<K: Kernel>: Sized {
     /// Returns `mnt_vfc`.
     fn fs(&self) -> *mut K::Filesystem;
 
+    /// Returns `mnt_op`.
+    fn ops(&self) -> &'static K::FsOps;
+
     /// Returns the value of `mnt_flag`.
     ///
     /// # Safety