Refactor inode module

Signed-off-by: Alessandro Passaro <alexpax@amazon.co.uk>
awslabs · Sep 27, 2024 · 6aec376 · 6aec376
1 parent 0b7d0ae
commit 6aec376
Show file tree

Hide file tree

Showing 8 changed files with 748 additions and 741 deletions.
diff --git a/mountpoint-s3/src/fs.rs b/mountpoint-s3/src/fs.rs
@@ -17,18 +17,18 @@ use mountpoint_s3_client::types::ETag;
 use mountpoint_s3_client::ObjectClient;
 
 use crate::fs::error_metadata::{ErrorMetadata, MOUNTPOINT_ERROR_LOOKUP_NONEXISTENT};
-use crate::inode::{
-    Inode, InodeError, InodeKind, LookedUp, ReadHandle, ReaddirHandle, Superblock, SuperblockConfig, WriteHandle,
-};
 use crate::logging;
 use crate::prefetch::{Prefetch, PrefetchResult};
 use crate::prefix::Prefix;
 use crate::s3::S3Personality;
+use crate::superblock::{
+    Inode, InodeError, InodeKind, LookedUp, ReadHandle, ReaddirHandle, Superblock, SuperblockConfig, WriteHandle,
+};
 use crate::sync::atomic::{AtomicI64, AtomicU64, Ordering};
 use crate::sync::{Arc, AsyncMutex, AsyncRwLock};
 use crate::upload::{UploadRequest, Uploader};
 
-pub use crate::inode::InodeNo;
+pub use crate::superblock::InodeNo;
 
 #[macro_use]
 mod error;

diff --git a/mountpoint-s3/src/fs/error.rs b/mountpoint-s3/src/fs/error.rs
@@ -4,8 +4,8 @@ use mountpoint_s3_client::error::{GetObjectError, ObjectClientError};
 use tracing::Level;
 
 use crate::fs::error_metadata::ErrorMetadata;
-use crate::inode::InodeError;
 use crate::prefetch::PrefetchReadError;
+use crate::superblock::InodeError;
 use crate::upload::UploadWriteError;
 
 /// Generate an error that includes a conversion to a libc errno for use in replies to FUSE.

diff --git a/mountpoint-s3/src/lib.rs b/mountpoint-s3/src/lib.rs
@@ -5,13 +5,13 @@ pub mod cli;
 pub mod data_cache;
 pub mod fs;
 pub mod fuse;
-mod inode;
 pub mod logging;
 pub mod metrics;
 mod object;
 pub mod prefetch;
 pub mod prefix;
 pub mod s3;
+mod superblock;
 mod sync;
 mod upload;