feat: replace ext4 driver ext4_rs with ext4plus

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 
-exclude = ["arceos", "crates/axconfig-gen"]
+exclude = ["arceos", "crates/axconfig-gen", "crates/ext4plus"]
 members = ["pulse_core", "pulse_syscalls"]
 
 [workspace.package]
@@ -71,7 +71,6 @@ axsched = { path = "crates/axsched" }
 memory_set = { path = "crates/memory_set" }
 memory_addr = { path = "crates/memory_addr" }
 axfs-ng-vfs = { path = "crates/axfs-ng-vfs" }
-ext4_rs = { path = "crates/ext4_rs" }
 axcpu = { path = "crates/axcpu" }
 axplat-loongarch64-qemu-virt = { path = "crates/axplat-loongarch64-qemu-virt" }
 axplat-riscv64-qemu-virt = { path = "crates/axplat-riscv64-qemu-virt" }

arceos/Cargo.toml

@@ -85,7 +85,6 @@ axsched = { path = "../crates/axsched" }
 memory_set = { path = "../crates/memory_set" }
 memory_addr = { path = "../crates/memory_addr" }
 axfs-ng-vfs = { path = "../crates/axfs-ng-vfs" }
-ext4_rs = { path = "../crates/ext4_rs" }
 axcpu = { path = "../crates/axcpu" }
 axplat-loongarch64-qemu-virt = { path = "../crates/axplat-loongarch64-qemu-virt" }
 axplat-riscv64-qemu-virt = { path = "../crates/axplat-riscv64-qemu-virt" }

arceos/modules/axfs/Cargo.toml

@@ -11,7 +11,7 @@ homepage.workspace = true
 default = ["ext4"]
 use-ramdisk = []       # TODO: init ramdisk
 fat = ["dep:fatfs"]
-ext4 = ["dep:ext4_rs"]
+ext4 = ["dep:ext4plus"]
 times = []
 std = []
 
@@ -38,9 +38,10 @@ scope-local = { workspace = true }
 slab = { version = "0.4.9", default-features = false }
 spin = { workspace = true }
 
-[dependencies.ext4_rs]
-version = "1.3.3"
+[dependencies.ext4plus]
+path = "../../../crates/ext4plus"
 default-features = false
+features = ["sync", "multi-threaded"]
 optional = true
 
 [dependencies.fatfs]

arceos/modules/axfs/src/disk.rs

@@ -7,7 +7,7 @@ use alloc::{
 use core::mem;
 
 use axdriver::{AxBlockDevice, prelude::*};
-use spin::Mutex;
+use kspin::SpinNoIrq as Mutex;
 
 fn take<'a>(buf: &mut &'a [u8], cnt: usize) -> &'a [u8] {
     let (first, rem) = buf.split_at(cnt);
@@ -124,15 +124,14 @@ pub static DISK_FLUSHERS: spin::Lazy<Mutex<alloc::vec::Vec<alloc::sync::Weak<dyn
 
 /// Flushes all registered disks.
 pub fn flush_all_disks() -> DevResult<()> {
-    let mut flushers = DISK_FLUSHERS.lock();
-    flushers.retain(|weak| {
-        if let Some(flusher) = weak.upgrade() {
-            let _ = flusher.flush_disk();
-            true
-        } else {
-            false
-        }
-    });
+    let flushers: alloc::vec::Vec<Arc<dyn DiskFlushable>> = {
+        let mut guard = DISK_FLUSHERS.lock();
+        guard.retain(|weak| weak.strong_count() > 0);
+        guard.iter().filter_map(|weak| weak.upgrade()).collect()
+    };
+    for flusher in flushers {
+        flusher.flush_disk()?;
+    }
     Ok(())
 }
 
@@ -278,10 +277,10 @@ impl<D: BlockDriverOps + 'static> SeekableDisk<D> {
         if buf.len() >= self.block_size() {
             let blocks = buf.len() >> self.block_size_log2;
             let length = blocks << self.block_size_log2;
-            self.dev.lock().write_block(self.inner.lock().block_id, take(&mut buf, length))?;
+            let mut inner = self.inner.lock();
+            self.dev.lock().write_block(inner.block_id, take(&mut buf, length))?;
             written += length;
 
-            let mut inner = self.inner.lock();
             inner.block_id += blocks as u64;
         }
         if !buf.is_empty() {

arceos/modules/axfs/src/fs/devfs.rs

@@ -16,7 +16,7 @@ use axfs_ng_vfs::{
 use axpoll::{IoEvents, Pollable};
 use rand_core::{Rng, SeedableRng};
 use rand_pcg::Pcg64Mcg;
-use spin::Mutex;
+use kspin::SpinNoIrq as Mutex;
 
 use super::super::disk::{SeekableDisk, SharedBlockDevice};