From 71eedf20cef81a7036ac9b2212f7c11a3f62ff1a Mon Sep 17 00:00:00 2001
From: numpy1314 <xzj13@mail.ustc.edu.cn>
Date: Sat, 21 Jun 2025 19:48:08 +0800
Subject: [PATCH 1/2] Upgrade axio to 0.1.1 and optimize default_read_to_end

---
 modules/axfs/Cargo.toml      |  2 +-
 modules/axfs/src/api/file.rs | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/axfs/Cargo.toml b/modules/axfs/Cargo.toml
index 8e0e4f00a0..3613ea343d 100644
--- a/modules/axfs/Cargo.toml
+++ b/modules/axfs/Cargo.toml
@@ -25,7 +25,7 @@ log = "=0.4.21"
 cfg-if = "1.0"
 lazyinit = "0.2"
 cap_access = "0.1"
-axio = { version = "0.1", features = ["alloc"] }
+axio = { version = "0.1.1", features = ["alloc"] }
 axerrno = "0.1"
 axfs_vfs = "0.1"
 axfs_devfs = { version = "0.1", optional = true }
diff --git a/modules/axfs/src/api/file.rs b/modules/axfs/src/api/file.rs
index eec1698548..1a3afe0882 100644
--- a/modules/axfs/src/api/file.rs
+++ b/modules/axfs/src/api/file.rs
@@ -1,4 +1,5 @@
-use axio::{Result, SeekFrom, prelude::*};
+use alloc::vec::Vec;
+use axio::{Result, SeekFrom, default_read_to_end, prelude::*};
 use core::fmt;
 
 use crate::fops;
@@ -174,6 +175,14 @@ impl Read for File {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
         self.inner.read(buf)
     }
+
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
+        default_read_to_end(
+            self,
+            buf,
+            self.metadata().ok().map(|metadata| metadata.size() as _),
+        )
+    }
 }
 
 impl Write for File {

From 27ac2ec7dd13f52db361113be7b3f885f0ebbb6f Mon Sep 17 00:00:00 2001
From: numpy1314 <xzj13@mail.ustc.edu.cn>
Date: Mon, 23 Jun 2025 15:27:09 +0800
Subject: [PATCH 2/2] Roll back the original changes

---
 modules/axfs/src/api/file.rs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/axfs/src/api/file.rs b/modules/axfs/src/api/file.rs
index 1a3afe0882..eec1698548 100644
--- a/modules/axfs/src/api/file.rs
+++ b/modules/axfs/src/api/file.rs
@@ -1,5 +1,4 @@
-use alloc::vec::Vec;
-use axio::{Result, SeekFrom, default_read_to_end, prelude::*};
+use axio::{Result, SeekFrom, prelude::*};
 use core::fmt;
 
 use crate::fops;
@@ -175,14 +174,6 @@ impl Read for File {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
         self.inner.read(buf)
     }
-
-    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize> {
-        default_read_to_end(
-            self,
-            buf,
-            self.metadata().ok().map(|metadata| metadata.size() as _),
-        )
-    }
 }
 
 impl Write for File {