[rfuse3]: refactor dependencies and improve example unmount logic

- Moved `clap` and `tracing-subscriber` to dev-dependencies in `Cargo.toml`.
- Updated the minimal filesystem example to unmount the filesystem after the select completes, preventing overlapping borrows.
- Enhanced the test script to implement platform-specific unmount logic for better reliability.

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

Author: LangQi99

project/rfuse3/Cargo.toml

@@ -38,7 +38,6 @@ async-io = { version = "2.3.1", optional = true }
 async-process = { version = "2.1.0", optional = true }
 bincode = "1.3.3"
 bytes = "1.10.1"
-clap = { version = "4.4", features = ["derive"] }
 futures-channel = { version = "0.3.30", features = ["sink"] }
 futures-util = { version = "0.3.30", features = ["sink"] }
 libc = "0.2.171"
@@ -59,7 +58,6 @@ nix = { version = "0.29.0", features = [
 serde = { version = "1.0", features = ["derive"] }
 slab = "0.4.9"
 tracing = { version = "0.1.41", features = ["attributes"] }
-tracing-subscriber = "0.3"
 trait-make = "0.1"
 which = { version = "4.4.2", optional = true }
 
@@ -68,6 +66,10 @@ version = "1.36"
 features = ["full"]
 optional = true
 
+[dev-dependencies]
+clap = { version = "4.4", features = ["derive"] }
+tracing-subscriber = "0.3"
+
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 features = ["file-lock", "unprivileged", "tokio-runtime"]

project/rfuse3/examples/minimal_filesystem_example.rs

@@ -391,9 +391,8 @@ async fn main() -> Result<()> {
     info!("  - ls {}  # List directory contents", args.mountpoint);
     info!("  - cat {}/hello.txt  # Read file", args.mountpoint);
     info!("Press Ctrl+C to unmount the filesystem");
-    let handle = &mut mount_handle;
     tokio::select! {
-        res = handle => {
+        res = &mut mount_handle => {
             match res {
                 Ok(_) => info!("Filesystem exited normally"),
                 Err(e) => {
@@ -404,13 +403,15 @@ async fn main() -> Result<()> {
         },
         _ = signal::ctrl_c() => {
             info!("Received exit signal, unmounting filesystem...");
-            mount_handle.unmount().await.map_err(|e| {
-                eprintln!("Unmount failed: {}", e);
-                e
-            })?;
-            info!("Filesystem unmounted");
         }
     }
 
+    // Unmount after the select completes to avoid overlapping borrows
+    mount_handle.unmount().await.map_err(|e| {
+        eprintln!("Unmount failed: {}", e);
+        e
+    })?;
+    info!("Filesystem unmounted");
+
     Ok(())
 }

project/rfuse3/src/lib.rs

@@ -24,7 +24,7 @@
     all(target_os = "linux", feature = "unprivileged"),
     target_os = "macos"
 ))]
-use std::io::{self, ErrorKind};
+use std::io;
 #[cfg(target_os = "macos")]
 use std::path::Path;
 #[cfg(any(
@@ -243,6 +243,7 @@ fn find_fusermount3() -> io::Result<PathBuf> {
 
 #[cfg(target_os = "macos")]
 fn find_macfuse_mount() -> io::Result<PathBuf> {
+    use std::io::ErrorKind;
     if Path::new("/Library/Filesystems/macfuse.fs/Contents/Resources/mount_macfuse").exists() {
         Ok(PathBuf::from(
             "/Library/Filesystems/macfuse.fs/Contents/Resources/mount_macfuse",

project/rfuse3/src/raw/connection/tokio.rs

@@ -3,9 +3,9 @@ use std::env;
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 use std::fs::File;
 use std::fs::OpenOptions;
+use std::io;
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 use std::io::Write;
-use std::io::{self, ErrorKind};
 use std::io::{IoSlice, IoSliceMut};
 use std::ops::{Deref, DerefMut};
 #[cfg(any(
@@ -234,6 +234,7 @@ impl BlockFuseConnection {
         mount_options: MountOptions,
         mount_path: impl AsRef<Path>,
     ) -> io::Result<Self> {
+        use std::io::ErrorKind;
         use std::{thread, time::Duration};
 
         use tokio::time::sleep;
@@ -416,6 +417,8 @@ struct NonBlockFuseConnection {
 impl NonBlockFuseConnection {
     #[cfg(any(target_os = "freebsd", target_os = "macos"))]
     fn new() -> io::Result<Self> {
+        use std::io::ErrorKind;
+
         #[cfg(target_os = "freebsd")]
         const DEV_FUSE: &str = "/dev/fuse";
 

project/rfuse3/src/raw/session.rs

@@ -4,7 +4,6 @@ use std::ffi::OsString;
 use std::fmt::{Debug, Formatter};
 use std::future::Future;
 use std::io::Error as IoError;
-use std::io::ErrorKind;
 use std::io::Result as IoResult;
 use std::num::NonZeroU32;
 #[allow(unused_imports)]
@@ -151,6 +150,7 @@ impl MountHandleInner {
             {
                 #[cfg(all(target_os = "linux", feature = "unprivileged"))]
                 if self.unprivileged {
+                    use std::io::ErrorKind;
                     let binary_path = find_fusermount3()?;
                     let mut child = Command::new(binary_path)
                         .args([OsStr::new("-u"), self.mount_path.as_os_str()])
@@ -3009,6 +3009,8 @@ impl<FS: Filesystem + Send + Sync + 'static> Session<FS> {
 #[cfg(any(feature = "async-io-runtime", feature = "tokio-runtime"))]
 impl<FS: Filesystem + Send + Sync + 'static> Session<FS> {
     async fn mount_empty_check(&self, mount_path: &Path) -> IoResult<()> {
+        use std::io::ErrorKind;
+
         #[cfg(all(not(feature = "async-io-runtime"), feature = "tokio-runtime"))]
         if !self.mount_options.nonempty
             && matches!(read_dir(mount_path).await?.next_entry().await, Ok(Some(_)))
@@ -3252,6 +3254,7 @@ impl<FS: Filesystem + Send + Sync + 'static> Session<FS> {
                 Either::Right((data, extend_data)) => (data, Some(extend_data)),
             };
             if let Err(err) = fuse_connection.write_vectored(data, extend_data).await.1 {
+                use std::io::ErrorKind;
                 if err.kind() == ErrorKind::NotFound {
                     warn!(
                         "may reply interrupted fuse request, ignore this error {}",
@@ -3276,6 +3279,8 @@ impl<FS: Filesystem + Send + Sync + 'static> Session<FS> {
         fs: &FS,
         fuse_connection: &FuseConnection,
     ) -> IoResult<NonZeroU32> {
+        use std::io::ErrorKind;
+
         let header_buffer = vec![0; FUSE_IN_HEADER_SIZE];
         let data_buffer = vec![0; FUSE_MIN_READ_BUFFER_SIZE];
 

project/rfuse3/tests/minimal_filesystem_test.sh

@@ -13,7 +13,14 @@ echo "Testing minimal filesystem example..."
 # Clean up any existing mount point
 if mount | grep -q " on $MOUNTPOINT "; then
     echo "Unmounting existing mount point..."
-    umount "$MOUNTPOINT" || true
+    # Use platform-specific unmount logic
+    if command -v fusermount3 >/dev/null 2>&1; then
+        fusermount3 -u "$MOUNTPOINT" || fusermount -u "$MOUNTPOINT" || umount "$MOUNTPOINT" || true
+    elif command -v fusermount >/dev/null 2>&1; then
+        fusermount -u "$MOUNTPOINT" || umount "$MOUNTPOINT" || true
+    else
+        umount "$MOUNTPOINT" || true
+    fi
 fi
 
 # Create mount point
@@ -28,8 +35,16 @@ echo "Starting filesystem at $MOUNTPOINT..."
 cargo run --example minimal_filesystem_example -- --mountpoint "$MOUNTPOINT" &
 FS_PID=$!
 
-# Set up cleanup trap
-trap "kill $FS_PID 2>/dev/null || true; umount $MOUNTPOINT 2>/dev/null || true; rmdir $MOUNTPOINT 2>/dev/null || true" EXIT
+# Set up cleanup trap with platform-specific unmount logic
+trap "kill $FS_PID 2>/dev/null || true; \
+if command -v fusermount3 >/dev/null 2>&1; then \
+    fusermount3 -u $MOUNTPOINT 2>/dev/null || fusermount -u $MOUNTPOINT 2>/dev/null || umount $MOUNTPOINT 2>/dev/null || true; \
+elif command -v fusermount >/dev/null 2>&1; then \
+    fusermount -u $MOUNTPOINT 2>/dev/null || umount $MOUNTPOINT 2>/dev/null || true; \
+else \
+    umount $MOUNTPOINT 2>/dev/null || true; \
+fi; \
+rmdir $MOUNTPOINT 2>/dev/null || true" EXIT
 
 # Wait for filesystem to be ready
 sleep 2