Adds vop_readdir_args

Author: ultimaweapon

kernel-1100/src/lib.rs

@@ -9,7 +9,7 @@ use self::socket::Socket;
 use self::thread::Thread;
 use self::ucred::Ucred;
 use self::uio::Uio;
-use self::vnode::{Vnode, VnodeOp, VopRead, VopUnlock, VopVector};
+use self::vnode::{Vnode, VnodeOp, VopRead, VopReadDir, VopUnlock, VopVector};
 use core::ffi::{c_char, c_int};
 use core::num::NonZero;
 use okf::fd::OpenFlags;
@@ -74,6 +74,7 @@ impl okf::Kernel for Kernel {
     type Vnode = Vnode;
     type VnodeOp = VnodeOp;
     type VopRead = VopRead;
+    type VopReadDir = VopReadDir;
     type VopUnlock = VopUnlock;
     type VopVector = VopVector;
 

kernel-1100/src/vnode.rs

@@ -1,7 +1,7 @@
 use crate::ucred::Ucred;
 use crate::uio::Uio;
-use crate::Kernel;
 use core::ffi::c_int;
+use okf::Kernel;
 
 /// Implementation of [`okf::vnode::Vnode`] for 11.00.
 #[repr(C)]
@@ -10,7 +10,7 @@ pub struct Vnode {
     ops: *mut VopVector,
 }
 
-impl okf::vnode::Vnode<Kernel> for Vnode {
+impl okf::vnode::Vnode<crate::Kernel> for Vnode {
     fn ops(&self) -> *mut VopVector {
         self.ops
     }
@@ -48,16 +48,14 @@ pub struct VopRead {
     cred: *mut Ucred,
 }
 
-impl okf::vnode::VopRead<Kernel> for VopRead {
+impl okf::vnode::VopRead<crate::Kernel> for VopRead {
     unsafe fn new(
-        k: Kernel,
+        k: crate::Kernel,
         vp: *mut Vnode,
         uio: *mut Uio,
         flags: c_int,
         cred: *mut Ucred,
     ) -> Self {
-        use okf::Kernel;
-
         Self {
             desc: k.var(crate::Kernel::VOP_READ).ptr(),
             vp,
@@ -67,3 +65,37 @@ impl okf::vnode::VopRead<Kernel> for VopRead {
         }
     }
 }
+
+/// Implementation of [`okf::vnode::VopReadDir`] for 11.00.
+#[repr(C)]
+pub struct VopReadDir {
+    desc: *mut VnodeOp,
+    vp: *mut Vnode,
+    uio: *mut Uio,
+    cred: *mut Ucred,
+    eof: *mut c_int,
+    ncookies: *mut c_int,
+    cookies: *mut *mut u64,
+}
+
+impl okf::vnode::VopReadDir<crate::Kernel> for VopReadDir {
+    unsafe fn new(
+        k: crate::Kernel,
+        vp: *mut Vnode,
+        uio: *mut Uio,
+        cred: *mut Ucred,
+        eof: *mut c_int,
+        ncookies: *mut c_int,
+        cookies: *mut *mut u64,
+    ) -> Self {
+        Self {
+            desc: k.var(crate::Kernel::VOP_READDIR).ptr(),
+            vp,
+            uio,
+            cred,
+            eof,
+            ncookies,
+            cookies,
+        }
+    }
+}

src/lib.rs

@@ -11,7 +11,7 @@ use self::socket::{SockAddr, Socket};
 use self::thread::Thread;
 use self::ucred::Ucred;
 use self::uio::{Uio, UioSeg};
-use self::vnode::{Vnode, VnodeOp, VopRead, VopUnlock, VopVector};
+use self::vnode::{Vnode, VnodeOp, VopRead, VopReadDir, VopUnlock, VopVector};
 use core::alloc::{GlobalAlloc, Layout};
 use core::ffi::{c_char, c_int};
 use core::marker::PhantomData;
@@ -78,6 +78,7 @@ pub trait Kernel: MappedKernel {
     type Vnode: Vnode<Self>;
     type VnodeOp: VnodeOp;
     type VopRead: VopRead<Self>;
+    type VopReadDir: VopReadDir<Self>;
     type VopUnlock: VopUnlock;
     type VopVector: VopVector;
 

src/vnode/op.rs

@@ -21,3 +21,20 @@ pub trait VopRead<K: Kernel>: Sized {
         cred: *mut K::Ucred,
     ) -> Self;
 }
+
+/// Represents `vop_readdir_args` structure.
+pub trait VopReadDir<K: Kernel>: Sized {
+    /// # Safety
+    /// - `vp` cannot be null and must be locked.
+    /// - `uio` cannot be null.
+    /// - `cred` cannot be null.
+    unsafe fn new(
+        k: K,
+        vp: *mut K::Vnode,
+        uio: *mut K::Uio,
+        cred: *mut K::Ucred,
+        eof: *mut c_int,
+        ncookies: *mut c_int,
+        cookies: *mut *mut u64,
+    ) -> Self;
+}