remove pub use in transport module

Use file_traits directly.

Signed-off-by: wllenyj <[email protected]>

Author: wllenyj

src/api/filesystem/async_io.rs

@@ -13,7 +13,7 @@ use async_trait::async_trait;
 
 use super::{Context, Entry, FileSystem, ZeroCopyReader, ZeroCopyWriter};
 use crate::abi::fuse_abi::{stat64, CreateIn, OpenOptions, SetattrValid};
-use crate::transport::AsyncFileReadWriteVolatile;
+use crate::file_traits::AsyncFileReadWriteVolatile;
 
 /// A trait for directly copying data from the fuse transport into a `File` without first storing it
 /// in an intermediate buffer in asynchronous mode.

src/api/filesystem/mod.rs

@@ -13,7 +13,7 @@ use std::io;
 use std::time::Duration;
 
 use crate::abi::fuse_abi as fuse;
-use crate::transport::FileReadWriteVolatile;
+use crate::file_traits::FileReadWriteVolatile;
 
 pub use fuse::FsOptions;
 pub use fuse::OpenOptions;

src/api/server/async_io.rs

@@ -20,9 +20,8 @@ use crate::api::filesystem::{
 use crate::api::server::{
     MetricsHook, Server, ServerUtil, SrvContext, BUFFER_HEADER_SIZE, MAX_BUFFER_SIZE,
 };
-use crate::transport::{
-    AsyncFileReadWriteVolatile, FileReadWriteVolatile, FsCacheReqHandler, Reader, Writer,
-};
+use crate::file_traits::{AsyncFileReadWriteVolatile, FileReadWriteVolatile};
+use crate::transport::{FsCacheReqHandler, Reader, Writer};
 use crate::{bytes_to_cstr, encode_io_error_kind, BitmapSlice, Error, Result};
 
 struct AsyncZcReader<'a, S: BitmapSlice = ()>(Reader<'a, S>);

src/api/server/mod.rs

@@ -26,7 +26,8 @@ use arc_swap::ArcSwap;
 
 use crate::abi::fuse_abi::*;
 use crate::api::filesystem::{Context, FileSystem, ZeroCopyReader, ZeroCopyWriter};
-use crate::transport::{FileReadWriteVolatile, Reader, Writer};
+use crate::file_traits::FileReadWriteVolatile;
+use crate::transport::{Reader, Writer};
 use crate::{bytes_to_cstr, BitmapSlice, Error, Result};
 
 #[cfg(feature = "async-io")]

src/transport/mod.rs

@@ -25,6 +25,12 @@ use lazy_static::lazy_static;
 use libc::{sysconf, _SC_PAGESIZE};
 use vm_memory::{ByteValued, VolatileSlice};
 
+#[cfg(feature = "async-io")]
+use crate::file_buf::FileVolatileBuf;
+use crate::file_buf::FileVolatileSlice;
+#[cfg(feature = "async-io")]
+use crate::file_traits::AsyncFileReadWriteVolatile;
+use crate::file_traits::FileReadWriteVolatile;
 use crate::BitmapSlice;
 
 mod fs_cache_req_handler;
@@ -38,12 +44,6 @@ pub use self::fs_cache_req_handler::FsCacheReqHandler;
 pub use self::fusedev::{FuseBuf, FuseChannel, FuseDevWriter, FuseSession};
 #[cfg(feature = "virtiofs")]
 pub use self::virtiofs::VirtioFsWriter;
-#[cfg(feature = "async-io")]
-pub use crate::file_buf::FileVolatileBuf;
-pub use crate::file_buf::FileVolatileSlice;
-#[cfg(feature = "async-io")]
-pub use crate::file_traits::AsyncFileReadWriteVolatile;
-pub use crate::file_traits::{FileReadWriteVolatile, FileSetLen};
 
 /// Transport layer specific error codes.
 #[derive(Debug)]