misc(kernel): make use of the stabilized div_ceil

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/drivers/block/ahci.rs

@@ -25,7 +25,7 @@ use crate::mem::paging::*;
 use crate::mem::AddressSpace;
 
 use crate::utils::sync::Mutex;
-use crate::utils::{CeilDiv, VolatileCell};
+use crate::utils::VolatileCell;
 
 use crate::drivers::pci::*;
 
@@ -201,7 +201,7 @@ pub struct DmaBuffer {
 
 impl DmaBuffer {
     pub fn sectors(&self) -> usize {
-        self.data_size.ceil_div(512)
+        self.data_size.div_ceil(512)
     }
 
     pub fn start(&self) -> PhysAddr {

src/aero_kernel/src/drivers/block/ide/mod.rs

@@ -32,7 +32,6 @@ use crate::fs::block::{BlockDevice, BlockDeviceInterface};
 
 use crate::mem::paging::OffsetPageTable;
 use crate::utils::sync::Mutex;
-use crate::utils::CeilDiv;
 
 use super::ahci::DmaRequest;
 
@@ -51,7 +50,7 @@ impl IdeDrive {
 
 impl BlockDeviceInterface for IdeDrive {
     fn read_block(&self, sector: usize, dest: &mut [MaybeUninit<u8>]) -> Option<usize> {
-        let count = dest.len().ceil_div(512);
+        let count = dest.len().div_ceil(512);
         let request = Arc::new(DmaRequest::new(sector, count));
 
         let res = self.channel.run_request(request, self.slave);

src/aero_kernel/src/drivers/block/nvme/mod.rs

@@ -35,7 +35,7 @@ use crate::mem::paging::*;
 
 use crate::utils::dma::*;
 use crate::utils::sync::BMutex;
-use crate::utils::{CeilDiv, VolatileCell};
+use crate::utils::VolatileCell;
 
 #[derive(Copy, Clone, Debug)]
 enum Error {
@@ -231,7 +231,7 @@ impl<'a> Namespace<'a> {
     fn rw_command(&self, opcode: CommandOpcode, sector: usize, start: PhysAddr, size_bytes: usize) {
         assert!(size_bytes != 0);
 
-        let blocks = size_bytes.ceil_div(self.block_size);
+        let blocks = size_bytes.div_ceil(self.block_size);
         let mut read_cmd = ReadWriteCommand::default();
 
         read_cmd.opcode = opcode as u8;

src/aero_kernel/src/fs/ext2/disk.rs

@@ -18,7 +18,6 @@
 use bit_field::BitField;
 
 use crate::fs::inode;
-use crate::utils::CeilDiv;
 
 trait Revsion {}
 
@@ -112,7 +111,7 @@ impl SuperBlock {
 
     /// Returns the length of the BGDT.
     pub fn bgdt_len(&self) -> usize {
-        self.blocks_count.ceil_div(self.blocks_per_group) as usize
+        self.blocks_count.div_ceil(self.blocks_per_group) as usize
     }
 
     pub fn bgdt_block(&self) -> usize {

src/aero_kernel/src/fs/ext2/mod.rs

@@ -34,7 +34,6 @@ use crate::mem::paging::*;
 
 use crate::socket::unix::UnixSocket;
 use crate::socket::SocketAddrRef;
-use crate::utils::CeilDiv;
 
 use self::group_desc::GroupDescriptors;
 
@@ -186,7 +185,7 @@ impl INode {
 
         let new_block = fs.bgdt.alloc_block_ptr()?;
 
-        let mut next_block_num = self.inode.read().size().ceil_div(block_size);
+        let mut next_block_num = self.inode.read().size().div_ceil(block_size);
 
         if next_block_num < 12 {
             let mut inode = self.inode.write();

src/aero_kernel/src/syscall/time.rs

@@ -23,14 +23,13 @@ use alloc::vec::Vec;
 use crate::userland::scheduler;
 use crate::userland::task::Task;
 use crate::utils::sync::{IrqGuard, Mutex};
-use crate::utils::CeilDiv;
 
 const CLOCK_TYPE_REALTIME: usize = 0;
 const CLOCK_TYPE_MONOTONIC: usize = 1;
 
 #[syscall]
 pub fn sleep(timespec: &TimeSpec) -> Result<usize, SyscallError> {
-    let duration = (timespec.tv_nsec as usize).ceil_div(1000000000) + timespec.tv_sec as usize;
+    let duration = (timespec.tv_nsec as usize).div_ceil(1000000000) + timespec.tv_sec as usize;
 
     scheduler::get_scheduler().inner.sleep(Some(duration))?;
 

src/aero_kernel/src/utils/mod.rs

@@ -223,32 +223,5 @@ impl<'a> StackHelper<'a> {
     }
 }
 
-pub trait CeilDiv {
-    fn ceil_div(self, d: Self) -> Self;
-}
-
-macro_rules! ceil_div_impl {
-    ($($t:ty)*) => ($(
-        impl CeilDiv for $t {
-            fn ceil_div(self, d: $t) -> $t {
-                (self + d - 1) / d
-            }
-        }
-    )*)
-}
-
-ceil_div_impl!(u8 u16 u32 u64 usize u128);
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn unsigned_div_ceil() {
-        assert_eq!((8usize).ceil_div(3), 3);
-        assert_eq!((7usize).ceil_div(4), 2);
-    }
-}
-
 #[repr(transparent)]
 pub struct LinkerSymbol<T: Copy>(core::cell::UnsafeCell<T>);