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

2
crates/servers/permission-manager/src/server.rs
View File

@@ -1,7 +1,7 @@
use server_framework::Server;
use types::id::ProcessId;
use crate::protocol::{CapabilityKind, PermissionRequest, PermissionResponse};
use crate::protocol::{PermissionRequest, PermissionResponse};
const MAX_PROCESSES: usize = 64;
const NUM_KINDS: usize = 9;

6
crates/servers/storage-server/src/fs/ext4/dir.rs
View File

@@ -2,7 +2,6 @@ use port_block_device::BlockDevice;
use crate::filesystem::{DirEntry, FileName};
use super::io::{read_block, write_block, read_u32, write_u32, read_u16, write_u16};
use super::superblock::Superblock;
use super::bgd::BlockGroupDescriptor;
use super::{Inode, Extent, EXTENT_MAGIC};
fn align4(n: usize) -> usize {
@@ -12,7 +11,6 @@ fn align4(n: usize) -> usize {
pub fn find_entry<B: BlockDevice>(
device: &mut B,
sb: &Superblock,
gdt_block: u32,
dir_inode: &Inode,
name: &[u8],
) -> Option<u32> {
@@ -54,7 +52,6 @@ pub fn find_entry<B: BlockDevice>(
pub fn add_entry<B: BlockDevice>(
device: &mut B,
sb: &Superblock,
gdt_block: u32,
dir_inode: &Inode,
name: &[u8],
child_inode: u32,
@@ -79,7 +76,6 @@ pub fn add_entry<B: BlockDevice>(
let phys = ext.physical_block + blk;
read_block(device, phys, spb, &mut block_buf);
let mut pos = 0;
let mut prev_pos = 0;
while pos + 8 <= sb.block_size {
let entry_inode = read_u32(&block_buf, pos);
let rec_len = read_u16(&block_buf, pos + 4) as usize;
@@ -113,7 +109,6 @@ pub fn add_entry<B: BlockDevice>(
return true;
}
prev_pos = pos;
pos += rec_len;
}
}
@@ -124,7 +119,6 @@ pub fn add_entry<B: BlockDevice>(
pub fn remove_entry<B: BlockDevice>(
device: &mut B,
sb: &Superblock,
gdt_block: u32,
dir_inode: &Inode,
name: &[u8],
) -> Option<u32> {

11
crates/servers/storage-server/src/fs/ext4/extent.rs
View File

@@ -5,17 +5,6 @@ use super::{Ext4, Extent, Inode, EXTENT_MAGIC};
use port_block_device::BlockDevice;
impl<B: BlockDevice> Ext4<B> {
pub(super) fn read_extents(&self, inode: &Inode) -> Option<Extent> {
if !inode.uses_extents() { return None; }
let hdr = &inode.block_data;
let magic = read_u16(hdr, 0);
if magic != EXTENT_MAGIC { return None; }
let entries = read_u16(hdr, 2);
let depth = read_u16(hdr, 6);
if depth != 0 || entries == 0 { return None; }
Some(Extent::parse(&hdr[12..24]))
}
pub(super) fn map_logical_block(&mut self, inode: &Inode, logical_block: u32) -> Option<u64> {
if !inode.uses_extents() { return None; }
let hdr = &inode.block_data;

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;

8
crates/servers/storage-server/src/fs/ext4/path.rs
View File

@@ -27,7 +27,7 @@ impl<B: BlockDevice> Ext4<B> {
pub fn find_in_dir_pub(&mut self, dir_inode_num: u32, name: &[u8]) -> Option<u32> {
let inode = self.read_inode(dir_inode_num)?;
dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &inode, name)
dir::find_entry(&mut self.device, &self.sb, &inode, name)
}
pub fn add_dir_entry(&mut self, dir_inode_num: u32, name: &[u8], child_inode: u32, file_type: u8) -> bool {
@@ -35,17 +35,17 @@ impl<B: BlockDevice> Ext4<B> {
Some(i) => i,
None => return false,
};
dir::add_entry(&mut self.device, &self.sb, self.gdt_block, &inode, name, child_inode, file_type)
dir::add_entry(&mut self.device, &self.sb, &inode, name, child_inode, file_type)
}
pub fn remove_dir_entry(&mut self, dir_inode_num: u32, name: &[u8]) -> Option<u32> {
let inode = self.read_inode(dir_inode_num)?;
dir::remove_entry(&mut self.device, &self.sb, self.gdt_block, &inode, name)
dir::remove_entry(&mut self.device, &self.sb, &inode, name)
}
pub(super) fn find_in_dir(&mut self, dir_inode: u32, name: &[u8]) -> Option<u32> {
let inode = self.read_inode(dir_inode)?;
dir::find_entry(&mut self.device, &self.sb, self.gdt_block, &inode, name)
dir::find_entry(&mut self.device, &self.sb, &inode, name)
}
pub(super) fn resolve_path(&mut self, path: &[u8]) -> Option<u32> {