move some utilities to common module

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

Author: wllenyj

src/transport/file_volatile_slice.rs renamed to src/common/file_buf.rs

@@ -458,7 +458,7 @@ mod async_io {
     use tokio_uring::fs::File;
 
     use super::*;
-    use crate::transport::file_volatile_slice::FileVolatileBuf;
+    use crate::file_buf::FileVolatileBuf;
 
     /// Extension of [FileReadWriteVolatile] to support io-uring based asynchronous IO.
     ///

src/transport/file_traits.rs renamed to src/common/file_traits.rs

@@ -0,0 +1,8 @@
+// Copyright (C) 2022 Alibaba Cloud. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+//! Some utilities to support fuse-backend-rs.
+
+pub mod file_buf;
+pub mod file_traits;

src/common/mod.rs

@@ -107,6 +107,9 @@ pub mod api;
 pub mod passthrough;
 pub mod transport;
 
+pub mod common;
+pub use self::common::*;
+
 /// Convert io::ErrorKind to OS error code.
 /// Reference to libstd/sys/unix/mod.rs => decode_error_kind.
 pub fn encode_io_error_kind(kind: ErrorKind) -> i32 {

src/lib.rs

@@ -18,7 +18,8 @@ use nix::sys::uio::writev;
 use nix::unistd::write;
 use vm_memory::{ByteValued, VolatileMemory, VolatileSlice};
 
-use super::{Error, FileReadWriteVolatile, FileVolatileSlice, IoBuffers, Reader, Result, Writer};
+use super::{Error, FileReadWriteVolatile, IoBuffers, Reader, Result, Writer};
+use crate::file_buf::FileVolatileSlice;
 use crate::BitmapSlice;
 
 #[cfg(target_os = "linux")]
@@ -334,8 +335,8 @@ impl<'a, S: BitmapSlice> io::Write for FuseDevWriter<'a, S> {
 #[cfg(feature = "async-io")]
 mod async_io {
     use super::*;
-    use crate::transport::file_volatile_slice::FileVolatileBuf;
-    use crate::transport::AsyncFileReadWriteVolatile;
+    use crate::file_buf::FileVolatileBuf;
+    use crate::file_traits::AsyncFileReadWriteVolatile;
 
     impl<'a, S: BitmapSlice> FuseDevWriter<'a, S> {
         /// Write data from a buffer into this writer in asynchronous mode.

src/transport/fusedev/mod.rs

@@ -27,25 +27,23 @@ use vm_memory::{ByteValued, VolatileSlice};
 
 use crate::BitmapSlice;
 
-mod file_traits;
-mod file_volatile_slice;
 mod fs_cache_req_handler;
 #[cfg(feature = "fusedev")]
 mod fusedev;
 #[cfg(feature = "virtiofs")]
 mod virtiofs;
 
-#[cfg(feature = "async-io")]
-pub use self::file_traits::AsyncFileReadWriteVolatile;
-pub use self::file_traits::{FileReadWriteVolatile, FileSetLen};
-#[cfg(feature = "async-io")]
-pub use self::file_volatile_slice::FileVolatileBuf;
-pub use self::file_volatile_slice::FileVolatileSlice;
 pub use self::fs_cache_req_handler::FsCacheReqHandler;
 #[cfg(feature = "fusedev")]
 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)]
@@ -163,7 +161,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
     }
 
     #[cfg(feature = "async-io")]
-    unsafe fn prepare_io_buf(&self, count: usize) -> Vec<file_volatile_slice::FileVolatileBuf> {
+    unsafe fn prepare_io_buf(&self, count: usize) -> Vec<FileVolatileBuf> {
         let mut rem = count;
         let mut bufs = Vec::with_capacity(self.buffers.len());
 
@@ -181,7 +179,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
                 buf.clone()
             };
             // Safe because we just change the interface to access underlying buffers.
-            bufs.push(file_volatile_slice::FileVolatileBuf::from_raw(
+            bufs.push(FileVolatileBuf::from_raw(
                 local_buf.as_ptr(),
                 local_buf.len(),
                 local_buf.len(),
@@ -195,7 +193,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
     }
 
     #[cfg(all(feature = "async-io", feature = "virtiofs"))]
-    unsafe fn prepare_mut_io_buf(&self, count: usize) -> Vec<file_volatile_slice::FileVolatileBuf> {
+    unsafe fn prepare_mut_io_buf(&self, count: usize) -> Vec<FileVolatileBuf> {
         let mut rem = count;
         let mut bufs = Vec::with_capacity(self.buffers.len());
 
@@ -212,7 +210,7 @@ impl<S: BitmapSlice> IoBuffers<'_, S> {
             } else {
                 buf.clone()
             };
-            bufs.push(file_volatile_slice::FileVolatileBuf::from_raw(
+            bufs.push(FileVolatileBuf::from_raw(
                 local_buf.as_ptr(),
                 0,
                 local_buf.len(),