Skip to content

fix:Fixes the "Block is free" issue when using the rsext4 file system. #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dirinkbottle wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix:Fixes the "Block is free" issue when using the rsext4 file system. #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df4331d
fix(axfs): update rsext4 to fix journal playback data inconsistency
Dirinkbottle Feb 11, 2026
d748e1a
fix(axfs): update rsext4 to fix journal playback data inconsistency
Dirinkbottle Feb 11, 2026
dd0a137
fix(axfs):Fixed an issue that caused bitmap inconsistencies when rest…
Dirinkbottle Feb 13, 2026
5732b2f
Merge branch 'master' into fix/rsext4-journal-playback
Dirinkbottle Feb 13, 2026
6f6d622
fix:resovle cargo.lock flict
Dirinkbottle Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

121 changes: 73 additions & 48 deletions modules/axfs/src/fs/ext4fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,22 @@ impl FileWrapper {
}
}

/// Flush all dirty caches to disk (bitmap, inode table, data blocks, superblock, group descriptors).
/// Should be called after metadata-modifying operations (create, remove, rename) to ensure consistency.
fn sync_to_disk(&self) {
let mut fs = self.fs.lock();
match &self.inner {
Ext4Inner::Disk(inner) => {
let mut inner = inner.lock();
fs.sync_filesystem(&mut *inner).ok();
}
Ext4Inner::Partition(inner) => {
let mut inner = inner.lock();
fs.sync_filesystem(&mut *inner).ok();
}
}
}

fn path_deal_with(&self, path: &str) -> String {
if path.starts_with('/') {
debug!("path_deal_with: {}", path);
Expand Down Expand Up @@ -213,31 +229,34 @@ impl VfsNodeOps for FileWrapper {
return Ok(());
}

let mut fs = self.fs.lock();
match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
match ty {
VfsNodeType::Dir => {
mkdir(&mut *inner, &mut *fs, &fpath);
}
_ => {
mkfile(&mut *inner, &mut *fs, &fpath, None, None);
{
let mut fs = self.fs.lock();
match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
match ty {
VfsNodeType::Dir => {
mkdir(&mut *inner, &mut *fs, &fpath);
}
_ => {
mkfile(&mut *inner, &mut *fs, &fpath, None, None);
}
}
}
}
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
match ty {
VfsNodeType::Dir => {
mkdir(&mut *inner, &mut *fs, &fpath);
}
_ => {
mkfile(&mut *inner, &mut *fs, &fpath, None, None);
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
match ty {
VfsNodeType::Dir => {
mkdir(&mut *inner, &mut *fs, &fpath);
}
_ => {
mkfile(&mut *inner, &mut *fs, &fpath, None, None);
}
}
}
}
}
self.sync_to_disk();
Ok(())
}

Expand All @@ -246,40 +265,43 @@ impl VfsNodeOps for FileWrapper {
let fpath = self.path_deal_with(path);
assert!(!fpath.is_empty()); // already check at `root.rs`

let mut fs = self.fs.lock();
let (_inode_num, inode) = match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
get_inode_with_num(&mut *fs, &mut *inner, &fpath)
.map_err(|_| VfsError::Io)?
.ok_or(VfsError::NotFound)?
}
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
get_inode_with_num(&mut *fs, &mut *inner, &fpath)
.map_err(|_| VfsError::Io)?
.ok_or(VfsError::NotFound)?
}
};
{
let mut fs = self.fs.lock();
let (_inode_num, inode) = match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
get_inode_with_num(&mut *fs, &mut *inner, &fpath)
.map_err(|_| VfsError::Io)?
.ok_or(VfsError::NotFound)?
}
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
get_inode_with_num(&mut *fs, &mut *inner, &fpath)
.map_err(|_| VfsError::Io)?
.ok_or(VfsError::NotFound)?
}
};

match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
if inode.is_dir() {
delete_dir(&mut *fs, &mut *inner, &fpath);
} else {
unlink(&mut *fs, &mut *inner, &fpath);
match self.inner {
Ext4Inner::Disk(ref inner) => {
let mut inner = inner.lock();
if inode.is_dir() {
delete_dir(&mut *fs, &mut *inner, &fpath);
} else {
unlink(&mut *fs, &mut *inner, &fpath);
}
}
}
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
if inode.is_dir() {
delete_dir(&mut *fs, &mut *inner, &fpath);
} else {
unlink(&mut *fs, &mut *inner, &fpath);
Ext4Inner::Partition(ref inner) => {
let mut inner = inner.lock();
if inode.is_dir() {
delete_dir(&mut *fs, &mut *inner, &fpath);
} else {
unlink(&mut *fs, &mut *inner, &fpath);
}
}
}
}
self.sync_to_disk();
Ok(())
}

Expand Down Expand Up @@ -465,6 +487,7 @@ impl VfsNodeOps for FileWrapper {
.map_err(|_| VfsError::Io)?;
}
};
self.sync_to_disk();
Ok(buf.len())
}

Expand All @@ -480,6 +503,7 @@ impl VfsNodeOps for FileWrapper {
let _ = truncate(&mut *inner, &mut *fs, &self.path, size);
}
}
self.sync_to_disk();
Ok(())
}

Expand All @@ -500,6 +524,7 @@ impl VfsNodeOps for FileWrapper {
let _ = mv(&mut *fs, &mut *inner, &src_fpath, &dst_fpath);
}
}
self.sync_to_disk();
Ok(())
}

Expand Down
1 change: 1 addition & 0 deletions modules/axfs/src/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ pub fn mount_virtual_fs(mut root_dir: RootDirectory) {
panic!("Failed to mount virtual filesystems: {:?}", e);
}


// Initialize global state
let root_dir = Arc::new(root_dir);
ROOT_DIR.init_once(root_dir.clone());
Expand Down
Loading