diff --git a/.gitignore b/.gitignore index aa882aa0..8354727e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ ltp/ testcase/24/final_no_ltp target/ rootfs/ +old_rootfs/ third-party/vendor/ crates/virtio-drivers/ crates/lwext4_rust/ diff --git a/Cargo.lock b/Cargo.lock index 51293baa..1fb3e5db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -503,7 +503,7 @@ dependencies = [ [[package]] name = "lwext4_rust" version = "0.2.0" -source = "git+https://github.com/ChenRuiwei/lwext4_rust.git?rev=293f#293f67aa0fd9bae7b9c8ff9a9ee9b7ff745aa410" +source = "git+https://github.com/ChenRuiwei/lwext4_rust.git?rev=fb4e#fb4ee4bebcfc68348534be1315c5fc7a71b35250" dependencies = [ "log", "printf-compat", diff --git a/modules/ext4/Cargo.toml b/modules/ext4/Cargo.toml index 5e6b4e95..fd627174 100644 --- a/modules/ext4/Cargo.toml +++ b/modules/ext4/Cargo.toml @@ -16,5 +16,5 @@ systype = { path = "../systype/" } log = "0.4" downcast-rs = { version = "1.2", default-features = false } async-trait = "0.1" -lwext4_rust = { git = "https://github.com/ChenRuiwei/lwext4_rust.git", rev = "293f" } +lwext4_rust = { git = "https://github.com/ChenRuiwei/lwext4_rust.git", rev = "fb4e" } # lwext4_rust = { path = "../../crates/lwext4_rust/" } diff --git a/modules/vfs-core/src/file.rs b/modules/vfs-core/src/file.rs index 331c2e7d..80597e8f 100644 --- a/modules/vfs-core/src/file.rs +++ b/modules/vfs-core/src/file.rs @@ -227,8 +227,8 @@ pub trait File: Send + Sync + DowncastSync { "[File::write_at] write beyond file, offset_it:{offset_it}, size:{}", self.size() ); - // self.base_write_at(self.size(), &buf[self.size() - offset..]) - // .await?; + self.base_write_at(self.size(), &buf[self.size() - offset..]) + .await?; let old_size = self.size(); let new_size = offset_it; // let virtio_blk = device diff --git a/testcase/24/final/run_ltp.sh b/testcase/24/final/run-ltp.sh similarity index 99% rename from testcase/24/final/run_ltp.sh rename to testcase/24/final/run-ltp.sh index 29eb52e9..5ab9bb92 100644 --- a/testcase/24/final/run_ltp.sh +++ b/testcase/24/final/run-ltp.sh @@ -104,7 +104,6 @@ ./test-ltp.sh ltp/testcases/bin/futex_wait04 ./test-ltp.sh ltp/testcases/bin/futex_wake01 ./test-ltp.sh ltp/testcases/bin/genload -./test-ltp.sh ltp/testcases/bin/genlog10 ./test-ltp.sh ltp/testcases/bin/getcontext01 ./test-ltp.sh ltp/testcases/bin/getcwd01 ./test-ltp.sh ltp/testcases/bin/getcwd02 @@ -182,7 +181,6 @@ ./test-ltp.sh ltp/testcases/bin/memset01 ./test-ltp.sh ltp/testcases/bin/mincore02 ./test-ltp.sh ltp/testcases/bin/mincore03 -./test-ltp.sh ltp/testcases/bin/mincore04 ./test-ltp.sh ltp/testcases/bin/mkdir04 ./test-ltp.sh ltp/testcases/bin/mkdirat01 ./test-ltp.sh ltp/testcases/bin/mknod09