transport: concurrently support fusedev and virtiofs

Previously fusedev and virtiofs transport drivers are mutual exclusive,
which is a strong constraints. So relax it.

Signed-off-by: Jiang Liu <[email protected]>

Author: jiangliu

Makefile

@@ -18,15 +18,18 @@ check-macos: build-macos
 
 check: build
 	cargo fmt -- --check
-	cargo clippy --features="fusedev" -- -Dwarnings
-	cargo clippy --features="virtiofs" -- -Dwarnings
-	cargo clippy --features="vhost-user-fs" -- -Dwarnings
-	cargo test --features="fusedev" -- --nocapture --skip integration
-	cargo test --features="virtiofs" -- --nocapture --skip integration
-	cargo test --features="vhost-user-fs" -- --nocapture --skip integration
-	cargo test --features="fusedev,async-io" -- --nocapture --skip integration
-	cargo test --features="virtiofs,async-io" -- --nocapture --skip integration
-	cargo test --features="vhost-user-fs,async-io" -- --nocapture --skip integration
+	cargo clippy --features="fusedev" --no-default-features -- -Dwarnings
+	cargo clippy --features="virtiofs" --no-default-features -- -Dwarnings
+	cargo clippy --features="vhost-user-fs" --no-default-features -- -Dwarnings
+	cargo clippy --features="fusedev,virtiofs" --no-default-features -- -Dwarnings
+	cargo test --features="fusedev" --no-default-features -- --nocapture --skip integration
+	cargo test --features="virtiofs" --no-default-features  -- --nocapture --skip integration
+	cargo test --features="vhost-user-fs" --no-default-features -- --nocapture --skip integration
+	cargo test --features="fusedev,virtiofs" --no-default-features -- --nocapture --skip integration
+	cargo test --features="fusedev,async-io" --no-default-features -- --nocapture --skip integration
+	cargo test --features="virtiofs,async-io" --no-default-features -- --nocapture --skip integration
+	cargo test --features="vhost-user-fs,async-io" --no-default-features -- --nocapture --skip integration
+	cargo test --features="fusedev,virtiofs,async-io" --no-default-features -- --nocapture --skip integration
 
 smoke: check
 	cargo test --features="fusedev" -- --nocapture

src/transport/fusedev/linux_session.rs

@@ -23,7 +23,7 @@ use nix::poll::{poll, PollFd, PollFlags};
 use nix::sys::epoll::{epoll_ctl, EpollEvent, EpollFlags, EpollOp};
 use nix::unistd::{getgid, getuid, read};
 
-use super::{super::pagesize, Error::SessionFailure, FuseBuf, Reader, Result, Writer};
+use super::{super::pagesize, Error::SessionFailure, FuseBuf, FuseDevWriter, Reader, Result};
 
 // These follows definition from libfuse.
 const FUSE_KERN_BUF_SIZE: usize = 256;
@@ -223,7 +223,7 @@ impl FuseChannel {
     /// - Ok(None): signal has pending on the exiting event channel
     /// - Ok(Some((reader, writer))): reader to receive request and writer to send reply
     /// - Err(e): error message
-    pub fn get_request(&mut self) -> Result<Option<(Reader, Writer)>> {
+    pub fn get_request(&mut self) -> Result<Option<(Reader, FuseDevWriter)>> {
         let mut events = Events::with_capacity(POLL_EVENTS_CAPACITY);
         let mut need_exit = false;
         loop {
@@ -281,7 +281,7 @@ impl FuseChannel {
                         // Reader::new() and Writer::new() should always return success.
                         let reader =
                             Reader::from_fuse_buffer(FuseBuf::new(&mut self.buf[..len])).unwrap();
-                        let writer = Writer::new(fd, buf).unwrap();
+                        let writer = FuseDevWriter::new(fd, buf).unwrap();
                         return Ok(Some((reader, writer)));
                     }
                     Err(e) => match e {

src/transport/fusedev/macos_session.rs

@@ -31,7 +31,7 @@ use nix::sys::socket::{
 use nix::unistd::{close, execv, fork, getpid, read, ForkResult};
 use nix::{cmsg_space, NixPath};
 
-use super::{Error::IoError, Error::SessionFailure, FuseBuf, Reader, Result, Writer};
+use super::{Error::IoError, Error::SessionFailure, FuseBuf, FuseDevWriter, Reader, Result};
 use crate::transport::pagesize;
 
 // These follows definition from libfuse.
@@ -225,7 +225,7 @@ impl FuseChannel {
     /// - Ok(None): signal has pending on the exiting event channel
     /// - Ok(Some((reader, writer))): reader to receive request and writer to send reply
     /// - Err(e): error message
-    pub fn get_request(&mut self) -> Result<Option<(Reader, Writer)>> {
+    pub fn get_request(&mut self) -> Result<Option<(Reader, FuseDevWriter)>> {
         let fd = self.file.as_raw_fd();
         loop {
             match read(fd, &mut self.buf) {
@@ -242,7 +242,7 @@ impl FuseChannel {
                     // Reader::new() and Writer::new() should always return success.
                     let reader =
                         Reader::from_fuse_buffer(FuseBuf::new(&mut self.buf[..len])).unwrap();
-                    let writer = Writer::new(fd, buf).unwrap();
+                    let writer = FuseDevWriter::new(fd, buf).unwrap();
                     return Ok(Some((reader, writer)));
                 }
                 Err(e) => match e {