mg/fat-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ls/ll works now

Browse source
This commit is contained in:
Moritz Gmeiner 2025-07-31 01:14:28 +02:00
commit 7f6c304709
5 changed files with 334 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

148
fat-fuse/src/lib.rs
View file

@ -1,10 +1,9 @@
mod fuse;
mod inode;
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::rc::Rc;
use fat_bits::dir::DirEntry;
use fat_bits::{FatFs, SliceLike};
use log::debug;
@ -18,11 +17,25 @@ pub struct FatFuse {
gid: u32,
next_ino: u64,
next_fd: u32,
next_fh: u64,
inode_table: BTreeMap<u64, Inode>,
ino_by_first_cluster: BTreeMap<u32, u64>,
ino_by_fh: BTreeMap<u64, u64>,
}
impl Drop for FatFuse {
fn drop(&mut self) {
println!("inode_table: {}", self.inode_table.len());
println!("ino_by_first_cluster: {}", self.ino_by_first_cluster.len());
for (&first_cluster, &ino) in self.ino_by_first_cluster.iter() {
println!("{} -> {}", first_cluster, ino);
}
println!("ino_by_fh: {}", self.ino_by_fh.len());
}
}
impl FatFuse {
@ -35,17 +48,24 @@ impl FatFuse {
let fat_fs = FatFs::load(data)?;
// TODO: build and insert root dir inode
Ok(FatFuse {
let mut fat_fuse = FatFuse {
fat_fs,
uid,
gid,
next_ino: 2, // 0 is reserved and 1 is root
next_fd: 0,
next_fh: 0,
inode_table: BTreeMap::new(),
ino_by_first_cluster: BTreeMap::new(),
})
ino_by_fh: BTreeMap::new(),
};
// TODO: build and insert root dir inode
let root_inode = Inode::root_inode(&fat_fuse.fat_fs, uid, gid);
fat_fuse.insert_inode(root_inode);
Ok(fat_fuse)
}
fn next_ino(&mut self) -> u64 {
@ -58,6 +78,16 @@ impl FatFuse {
ino
}
fn next_fh(&mut self) -> u64 {
let fh = self.next_fh;
assert!(!self.ino_by_fh.contains_key(&fh));
self.next_fh += 1;
fh
}
fn insert_inode(&mut self, inode: Inode) -> &mut Inode {
let ino = inode.ino();
let generation = inode.generation();
@ -81,8 +111,6 @@ impl FatFuse {
}
};
let old_ino = self.ino_by_first_cluster.insert(first_cluster, ino);
debug!(
"inserted new inode with ino {} and generation {} (first cluster: {})",
ino, generation, first_cluster
@ -92,14 +120,18 @@ impl FatFuse {
debug!("ejected inode {} {}", old_inode.ino(), old_inode.generation());
}
if let Some(old_ino) = old_ino {
debug!("ejected old {} -> {} cluster to ino mapping", first_cluster, old_ino);
if first_cluster != 0 {
if let Some(old_ino) = self.ino_by_first_cluster.insert(first_cluster, ino) {
debug!("ejected old {} -> {} cluster to ino mapping", first_cluster, old_ino);
}
}
new_inode
}
fn drop_inode(&mut self, ino: u64) {
debug!("dropping ino {}", ino);
let Some(inode) = self.inode_table.remove(&ino) else {
debug!("tried to drop inode with ino {}, but was not in table", ino);
@ -108,30 +140,30 @@ impl FatFuse {
let first_cluster = inode.first_cluster();
let entry = self.ino_by_first_cluster.entry(first_cluster);
if first_cluster != 0 {
let entry = self.ino_by_first_cluster.entry(first_cluster);
match entry {
std::collections::btree_map::Entry::Vacant(_) => debug!(
"removed inode with ino {} from table, but it's first cluster did not point to any ino",
ino
),
std::collections::btree_map::Entry::Occupied(occupied_entry) => {
let found_ino = *occupied_entry.get();
match entry {
std::collections::btree_map::Entry::Vacant(_) => debug!(
"removed inode with ino {} from table, but it's first cluster did not point to any ino",
ino
),
std::collections::btree_map::Entry::Occupied(occupied_entry) => {
let found_ino = *occupied_entry.get();
if found_ino == ino {
// matches our inode, remove it
occupied_entry.remove();
} else {
// does not match removed inode, leave it as is
debug!(
"removed inode with ino {} from table, but it's first cluster pointer to ino {} instead",
ino, found_ino
);
if found_ino == ino {
// matches our inode, remove it
occupied_entry.remove();
} else {
// does not match removed inode, leave it as is
debug!(
"removed inode with ino {} from table, but it's first cluster pointer to ino {} instead",
ino, found_ino
);
}
}
}
}
todo!()
}
fn get_inode(&self, ino: u64) -> Option<&Inode> {
@ -142,7 +174,31 @@ impl FatFuse {
self.inode_table.get_mut(&ino)
}
fn get_or_make_inode_by_dir_entry(&mut self, dir_entry: &DirEntry) -> &mut Inode {
if self
.get_inode_by_first_cluster_mut(dir_entry.first_cluster())
.is_some()
{
return self
.get_inode_by_first_cluster_mut(dir_entry.first_cluster())
.unwrap();
}
// no inode found, make a new one
let ino = self.next_ino();
let inode = Inode::new(&self.fat_fs, dir_entry, ino, self.uid, self.gid);
self.insert_inode(inode)
}
pub fn get_inode_by_first_cluster(&self, first_cluster: u32) -> Option<&Inode> {
if first_cluster == 0 {
debug!("trying to get inode by first cluster 0");
return None;
}
let ino = self.ino_by_first_cluster.get(&first_cluster)?;
if let Some(inode) = self.inode_table.get(ino) {
@ -158,6 +214,12 @@ impl FatFuse {
}
pub fn get_inode_by_first_cluster_mut(&mut self, first_cluster: u32) -> Option<&mut Inode> {
if first_cluster == 0 {
debug!("trying to get inode by first cluster 0");
return None;
}
let ino = self.ino_by_first_cluster.get(&first_cluster)?;
if let Some(inode) = self.inode_table.get_mut(ino) {
@ -171,4 +233,28 @@ impl FatFuse {
None
}
}
pub fn get_inode_by_fh(&self, fh: u64) -> Option<&Inode> {
let ino = self.ino_by_fh.get(&fh)?;
if let Some(inode) = self.inode_table.get(ino) {
Some(inode)
} else {
debug!("fh {} is mapped to ino {}, but inode is not in table", fh, ino);
None
}
}
pub fn get_inode_by_fh_mut(&mut self, fh: u64) -> Option<&mut Inode> {
let ino = self.ino_by_fh.get(&fh)?;
if let Some(inode) = self.inode_table.get_mut(ino) {
Some(inode)
} else {
debug!("fh {} is mapped to ino {}, but inode is not in table", fh, ino);
None
}
}
}