Adds mnt_stat

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, Mount};
+use self::mount::{Filesystem, FsStats, Mount};
 use self::pcpu::Pcpu;
 use self::socket::Socket;
 use self::thread::Thread;
@@ -47,6 +47,7 @@ impl okf::Kernel for Kernel {
 
     type File = File;
     type Filesystem = Filesystem;
+    type FsStats = FsStats;
     type LockObject = LockObject;
     type Malloc = Malloc;
     type Mount = Mount;

kernel-1100/src/mount.rs

@@ -13,6 +13,8 @@ pub struct Mount {
     fs: *mut Filesystem,
     pad3: [u8; 0x38],
     flags: u64,
+    pad4: [u8; 0x20],
+    stats: FsStats,
 }
 
 impl okf::mount::Mount<Kernel> for Mount {
@@ -35,6 +37,10 @@ impl okf::mount::Mount<Kernel> for Mount {
     unsafe fn flags(&self) -> u64 {
         self.flags
     }
+
+    fn stats(&self) -> *mut FsStats {
+        &self.stats as *const FsStats as *mut FsStats
+    }
 }
 
 /// Implementation of [`okf::mount::Filesystem`] for 11.00.
@@ -49,3 +55,11 @@ impl okf::mount::Filesystem for Filesystem {
         self.name.as_ptr()
     }
 }
+
+/// Implementation of [`okf::mount::FsStats`] for 11.00.
+#[repr(C)]
+pub struct FsStats {
+    pad: [u8; 0x1d8],
+}
+
+impl okf::mount::FsStats for 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, Mount};
+use self::mount::{Filesystem, FsStats, Mount};
 use self::pcpu::Pcpu;
 use self::queue::TailQueue;
 use self::socket::{SockAddr, Socket};
@@ -55,6 +55,7 @@ pub trait Kernel: MappedKernel {
 
     type File: File;
     type Filesystem: Filesystem;
+    type FsStats: FsStats;
     type LockObject: LockObject;
     type Malloc: Malloc;
     type Mount: Mount<Self>;

src/mount/fs.rs

@@ -0,0 +1,7 @@
+use core::ffi::c_char;
+
+/// Represents `vfsconf` structure.
+pub trait Filesystem: Sized {
+    /// Returns `vfc_name`.
+    fn name(&self) -> *const c_char;
+}

src/mount/mod.rs

@@ -1,6 +1,10 @@
+pub use self::fs::*;
+pub use self::stats::*;
 use crate::queue::TailQueueEntry;
 use crate::Kernel;
-use core::ffi::c_char;
+
+mod fs;
+mod stats;
 
 /// Represents `mount` structure.
 pub trait Mount<K: Kernel>: Sized {
@@ -27,10 +31,7 @@ pub trait Mount<K: Kernel>: Sized {
     /// # Safety
     /// [`Mount::mtx()`] must be locked.
     unsafe fn flags(&self) -> u64;
-}
 
-/// Represents `vfsconf` structure.
-pub trait Filesystem: Sized {
-    /// Returns `vfc_name`.
-    fn name(&self) -> *const c_char;
+    /// Returns `mnt_stat`.
+    fn stats(&self) -> *mut K::FsStats;
 }

src/mount/stats.rs

@@ -0,0 +1,2 @@
+/// Represents `statfs` structure.
+pub trait FsStats: Sized {}