JohnyTheCarrot/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Issues Pull requests Packages Projects Releases Wiki Activity

vfs: rename FsNode::close() to FsNode::release()

Browse source 
FsNode::close() will instead become a method that takes a closes a file descriptor, while release() will close the whole VFS node.
This commit is contained in:
TheOddGarlic 2022-08-03 21:17:28 +03:00
parent cdb6632f98
commit 2a163a55ee
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ableos/src/filesystem/ext2.rs
View file

@ -45,7 +45,7 @@ where
Ok(FileDescriptor::new(node.flags, inode.size(), node.inode)) Ok(FileDescriptor::new(node.flags, inode.size(), node.inode))
} }
fn close(&self, node: &super::FsNode) -> Result<()> { fn release(&self, node: &super::FsNode) -> Result<()> {
todo!() todo!()
} }

6
ableos/src/filesystem/mod.rs
View file

@ -22,7 +22,7 @@ where
Self: Send, Self: Send,
{ {
fn open(&self, node: &FsNode /* TODO: flags */) -> Result<FileDescriptor>; fn open(&self, node: &FsNode /* TODO: flags */) -> Result<FileDescriptor>;
fn close(&self, node: &FsNode) -> Result<()>; fn release(&self, node: &FsNode) -> Result<()>;
fn read(&self, node: &FsNode, offset: usize, size: usize) -> Result<Box<[u8]>>; fn read(&self, node: &FsNode, offset: usize, size: usize) -> Result<Box<[u8]>>;
fn write(&self, node: &FsNode, offset: usize, buffer: Box<[u8]>) -> Result<()>; fn write(&self, node: &FsNode, offset: usize, buffer: Box<[u8]>) -> Result<()>;
fn read_dir(&self, node: &FsNode, index: usize) -> Result<DirectoryEntry>; fn read_dir(&self, node: &FsNode, index: usize) -> Result<DirectoryEntry>;
@ -79,13 +79,13 @@ impl FsNode {
/// This method is for closing the VFS node, which is done when no open file /// This method is for closing the VFS node, which is done when no open file
/// descriptors for this file are left. /// descriptors for this file are left.
pub fn close(&self) -> Result<()> { pub fn release(&self) -> Result<()> {
let state = KERNEL_STATE.lock(); let state = KERNEL_STATE.lock();
let device = state let device = state
.get_storage_device(self.device_handle) .get_storage_device(self.device_handle)
.ok_or_else(|| FsError::InvalidDevice)?; .ok_or_else(|| FsError::InvalidDevice)?;
device.close(self) device.release(self)
} }
/// This method reads from the VFS node without opening a new file /// This method reads from the VFS node without opening a new file