duckran
/
asterinas
mirror of https://github.com/FallingLeavez/asterinas.git
0
0
Fork 0
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Simplify VMO APIs and break long lines

This commit is contained in:
Ruihan Li 2026-05-20 14:12:41 +08:00 committed by Chengjun Chen
parent 4bad9d34ae
commit f8a20b442c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/src/vm/page_cache/vmo/mod.rs
View File

@ -214,8 +214,9 @@ impl Vmo {
///
/// For anonymous VMOs the page is zero-filled on first access.
/// For VMOs with a backend this may perform synchronous I/O.
pub fn commit_on(&self, page_idx: usize) -> Result<CachePage> {
self.commit_on_internal(page_idx, CommitMode::Read)
pub fn commit_on(&self, page_idx: usize) -> Result<()> {
self.commit_on_internal(page_idx, CommitMode::Read)?;
Ok(())
}
fn commit_on_internal(&self, page_idx: usize, commit_mode: CommitMode) -> Result<CachePage> {
@ -416,7 +417,8 @@ impl Vmo {
page_offset = 0;
}
// `current_idx < page_idx_range.end` guarantees at least one page is successfully collected here.
// `current_idx < page_idx_range.end` guarantees at least one page is successfully
// collected here.
current_idx = page_batch.last().unwrap().0 + 1;
}
@ -548,7 +550,8 @@ impl Vmo {
*page_offset = 0;
}
// `current_idx < page_idx_range.end` guarantees at least one page is successfully collected here.
// `current_idx < page_idx_range.end` guarantees at least one page is successfully
// collected here.
current_idx = page_batch.last().unwrap().0 + 1;
}
@ -573,7 +576,8 @@ impl Vmo {
while current_idx < page_idx_range.end {
self.collect_pages(current_idx, page_idx_range.end, commit_mode, page_batch)?;
// `current_idx < page_idx_range.end` guarantees at least one page is successfully collected here.
// `current_idx < page_idx_range.end` guarantees at least one page is successfully
// collected here.
let next_idx = page_batch.last().unwrap().0 + 1;
for (_, page) in page_batch.drain(..) {

4
kernel/src/vm/vmar/vm_mapping.rs
View File

@ -909,8 +909,8 @@ impl MappedVmo {
///
/// This method may involve I/O operations if the VMO needs to fetch
/// a page from the underlying page cache.
pub fn commit_on(&self, page_idx: usize) -> Result<UFrame> {
self.vmo.commit_on(page_idx).map(|frame| frame.into())
pub fn commit_on(&self, page_idx: usize) -> Result<()> {
self.vmo.commit_on(page_idx)
}
/// Traverses the indices within a specified range of a VMO sequentially.