diff --git a/blobfs/Cargo.toml b/blobfs/Cargo.toml index 053702444b7..26a270e5526 100644 --- a/blobfs/Cargo.toml +++ b/blobfs/Cargo.toml @@ -18,7 +18,7 @@ rafs = { path = "../rafs" } nydus-error = { path = "../error" } storage = { path = "../storage", features = ["backend-localfs", "backend-oss", "backend-registry"] } -fuse-backend-rs = { git = "https://github.com/cloud-hypervisor/fuse-backend-rs.git", rev = "afc7b69", optional = true } +fuse-backend-rs = { git = "https://github.com/cloud-hypervisor/fuse-backend-rs.git", rev = "afc7b69" } [features] virtiofs = [ "fuse-backend-rs/virtiofs", "vm-memory/backend-mmap"] diff --git a/rafs/src/fs.rs b/rafs/src/fs.rs index eb3f9349d9e..c1969d820ac 100644 --- a/rafs/src/fs.rs +++ b/rafs/src/fs.rs @@ -1097,4 +1097,3 @@ pub(crate) mod tests { assert!(BlobPrefetchConfig::try_from(&config).is_ok()); } } - diff --git a/src/bin/nydusd/fusedev.rs b/src/bin/nydusd/fusedev.rs index 676096a547b..9f675fe1a8a 100644 --- a/src/bin/nydusd/fusedev.rs +++ b/src/bin/nydusd/fusedev.rs @@ -21,20 +21,20 @@ use std::thread::{self, JoinHandle}; use std::time::{SystemTime, UNIX_EPOCH}; use fuse_backend_rs::abi::linux_abi::{InHeader, OutHeader}; -use fuse_backend_rs::transport::fusedev::{FuseChannel, FuseSession}; use fuse_backend_rs::api::server::{MetricsHook, Server}; use fuse_backend_rs::api::Vfs; +use fuse_backend_rs::transport::fusedev::{FuseChannel, FuseSession}; use nix::sys::stat::{major, minor}; use nydus_app::BuildTimeInfo; use serde::Serialize; use vmm_sys_util::eventfd::EventFd; -use crate::upgrade::{self, FailoverPolicy, UpgradeManager}; use crate::daemon::{ DaemonError, DaemonResult, DaemonState, DaemonStateMachineContext, DaemonStateMachineInput, DaemonStateMachineSubscriber, FsBackendCollection, FsBackendMountCmd, NydusDaemon, Trigger, }; use crate::exit_event_manager; +use crate::upgrade::{self, FailoverPolicy, UpgradeManager}; #[derive(Serialize)] struct FuseOp { @@ -398,7 +398,6 @@ pub fn create_nydus_daemon( mount_cmd: Option, bti: BuildTimeInfo, ) -> Result> { - let (trigger, events_rx) = channel::(); let session = FuseSession::new(Path::new(mountpoint), "rafs", "", readonly)?; // Create upgrade manager diff --git a/src/bin/nydusd/main.rs b/src/bin/nydusd/main.rs index 50293c872ca..dd74a402ae5 100644 --- a/src/bin/nydusd/main.rs +++ b/src/bin/nydusd/main.rs @@ -235,7 +235,7 @@ fn main() -> Result<()> { .short("B") .help("Rafs filesystem bootstrap/metadata file") .takes_value(true) - .conflicts_with("shared-dir") + .conflicts_with("shared-dir"), ) .arg( Arg::with_name("shared-dir") @@ -246,11 +246,12 @@ fn main() -> Result<()> { .conflicts_with("bootstrap"), ) .arg( - Arg::with_name("hybrid-mode").long("hybrid-mode") - .help("run nydusd in rafs and passthroughfs hybrid mode") - .required(false) - .takes_value(false) - .global(true) + Arg::with_name("hybrid-mode") + .long("hybrid-mode") + .help("run nydusd in rafs and passthroughfs hybrid mode") + .required(false) + .takes_value(false) + .global(true), ); #[cfg(feature = "fusedev")] diff --git a/storage/src/device.rs b/storage/src/device.rs index ce318477ccd..dabae321b9f 100644 --- a/storage/src/device.rs +++ b/storage/src/device.rs @@ -864,7 +864,11 @@ impl BlobDevice { } /// Read a range of data from blob into the provided writer - pub fn read_to(&self, w: &mut dyn ZeroCopyWriter, desc: &mut BlobIoVec) -> io::Result { + pub fn read_to( + &self, + w: &mut dyn ZeroCopyWriter, + desc: &mut BlobIoVec, + ) -> io::Result { // Validate that: // - bi_vec[0] is valid // - bi_vec[0].blob.blob_index() is valid