Skip to content

refactor(fs/mem): use imported locks #2088

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

Merged
mkroening merged 1 commit into from
Nov 28, 2025
Merged

refactor(fs/mem): use imported locks #2088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/fs/mem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ impl VfsNode for RomFile {
NodeKind::File
}

fn get_object(&self) -> io::Result<Arc<async_lock::RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(async_lock::RwLock::new(RomFileInterface::new(
fn get_object(&self) -> io::Result<Arc<RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(RwLock::new(RomFileInterface::new(
self.data.clone(),
))))
}
Expand Down Expand Up @@ -350,8 +350,8 @@ impl VfsNode for RamFile {
NodeKind::File
}

fn get_object(&self) -> io::Result<Arc<async_lock::RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(async_lock::RwLock::new(RamFileInterface::new(
fn get_object(&self) -> io::Result<Arc<RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(RwLock::new(RamFileInterface::new(
self.data.clone(),
))))
}
Expand Down Expand Up @@ -506,7 +506,7 @@ impl MemDirectory {
components: &mut Vec<&str>,
opt: OpenOption,
mode: AccessPermission,
) -> io::Result<Arc<async_lock::RwLock<dyn ObjectInterface>>> {
) -> io::Result<Arc<RwLock<dyn ObjectInterface>>> {
if let Some(component) = components.pop() {
let node_name = String::from(component);

Expand All @@ -527,7 +527,7 @@ impl MemDirectory {
} else if opt.contains(OpenOption::O_CREAT) {
let file = Box::new(RamFile::new(mode));
guard.insert(node_name, file.clone());
return Ok(Arc::new(async_lock::RwLock::new(RamFileInterface::new(
return Ok(Arc::new(RwLock::new(RamFileInterface::new(
file.data.clone(),
))));
} else {
Expand All @@ -549,10 +549,10 @@ impl VfsNode for MemDirectory {
NodeKind::Directory
}

fn get_object(&self) -> io::Result<Arc<async_lock::RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(async_lock::RwLock::new(
MemDirectoryInterface::new(self.inner.clone()),
)))
fn get_object(&self) -> io::Result<Arc<RwLock<dyn ObjectInterface>>> {
Ok(Arc::new(RwLock::new(MemDirectoryInterface::new(
self.inner.clone(),
))))
}

fn get_file_attributes(&self) -> io::Result<FileAttr> {
Expand Down Expand Up @@ -743,7 +743,7 @@ impl VfsNode for MemDirectory {
components: &mut Vec<&str>,
opt: OpenOption,
mode: AccessPermission,
) -> io::Result<Arc<async_lock::RwLock<dyn ObjectInterface>>> {
) -> io::Result<Arc<RwLock<dyn ObjectInterface>>> {
block_on(self.async_traverse_open(components, opt, mode), None)
}

Expand Down