GKaszewski/k-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix build warnings (unused vars/imports, dead ext4 param/field/fn)

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-10-27 14:12:50 +01:00
parent b4390b7b6d
commit 37c482c36c
7 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/servers/storage-server/src/fs/ext4/mod.rs
View File

@@ -8,7 +8,7 @@ mod inode;
mod path;
use port_block_device::BlockDevice;
use crate::filesystem::{DirEntry, FileHandle, FileName, FileSystem};
use crate::filesystem::{DirEntry, FileHandle, FileSystem};
use io::read_block;
use superblock::Superblock;
@@ -24,7 +24,6 @@ struct OpenFile {
inode_num: u32,
size: usize,
offset: usize,
name: FileName,
block_data: [u8; 60],
}
@@ -64,7 +63,6 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
inode_num,
size: inode.size as usize,
offset: 0,
name: FileName::from_bytes(path),
block_data: inode.block_data,
});
Some(handle)
@@ -193,7 +191,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
for i in 0..count {
if !entries[i].is_dir {
let name = entries[i].name;
if let Some(child_ino) = dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &inode, name.as_bytes()) {
if let Some(child_ino) = dir::find_entry(&mut self.device, &self.sb, &inode, name.as_bytes()) {
if let Some(child) = self.read_inode(child_ino) {
entries[i].size = child.size as usize;
}
@@ -208,7 +206,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
let parent_inode = self.read_inode(parent_inode_num)?;
if !parent_inode.is_dir() { return None; }
if dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, filename).is_some() {
if dir::find_entry(&mut self.device, &self.sb, &parent_inode, filename).is_some() {
return None;
}
@@ -217,7 +215,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
self.write_inode(new_inode_num, &new_inode);
let parent_inode = self.read_inode(parent_inode_num)?;
if !dir::add_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, filename, new_inode_num, 1) {
if !dir::add_entry(&mut self.device, &self.sb, &parent_inode, filename, new_inode_num, 1) {
self.free_inode(new_inode_num);
return None;
}
@@ -227,7 +225,6 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
inode_num: new_inode_num,
size: 0,
offset: 0,
name: FileName::from_bytes(path),
block_data: new_inode.block_data,
});
Some(handle)
@@ -243,7 +240,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
None => return false,
};
let child_inode_num = match dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, filename) {
let child_inode_num = match dir::find_entry(&mut self.device, &self.sb, &parent_inode, filename) {
Some(n) => n,
None => return false,
};
@@ -258,7 +255,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
Some(i) => i,
None => return false,
};
if dir::remove_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, filename).is_none() {
if dir::remove_entry(&mut self.device, &self.sb, &parent_inode, filename).is_none() {
return false;
}
@@ -292,7 +289,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
};
if !parent_inode.is_dir() { return false; }
if dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, dirname).is_some() {
if dir::find_entry(&mut self.device, &self.sb, &parent_inode, dirname).is_some() {
return false;
}
@@ -324,7 +321,7 @@ impl<B: BlockDevice> FileSystem for Ext4<B> {
Some(i) => i,
None => return false,
};
if !dir::add_entry(&mut self.device, &self.sb, self.gdt_block, &parent_inode, dirname, new_inode_num, 2) {
if !dir::add_entry(&mut self.device, &self.sb, &parent_inode, dirname, new_inode_num, 2) {
self.free_block(new_block);
self.free_inode(new_inode_num);
return false;