Merge pull request #68 from Sherlock-Holo/write_flags_in_write_op

feat: add write_flags arguments in the write method

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fuse3"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Sherlock Holo <[email protected]>"]
 edition = "2021"
 readme = "README.md"

examples/src/memfs/main.rs

@@ -554,6 +554,7 @@ impl Filesystem for Fs {
         _fh: u64,
         offset: u64,
         mut data: &[u8],
+        _write_flags: u32,
         _flags: u32,
     ) -> Result<ReplyWrite> {
         let inner = self.0.read().await;

examples/src/path_memfs/main.rs

@@ -518,6 +518,7 @@ impl PathFilesystem for Fs {
         _fh: u64,
         offset: u64,
         data: &[u8],
+        _write_flags: u32,
         _flags: u32,
     ) -> Result<ReplyWrite> {
         let path = path.ok_or_else(Errno::new_not_exist)?.to_string_lossy();
@@ -861,8 +862,9 @@ impl PathFilesystem for Fs {
             .read(req, from_path, fh_in, offset_in, length as _)
             .await?;
 
+        // write_flags set to 0 because we don't care it in this example implement
         let ReplyWrite { written } = self
-            .write(req, to_path, fh_out, offset_out, &data.data, flags as _)
+            .write(req, to_path, fh_out, offset_out, &data.data, 0, flags as _)
             .await?;
 
         Ok(ReplyCopyFileRange {

src/path/inode_path_bridge.rs

@@ -574,6 +574,7 @@ where
         fh: u64,
         offset: u64,
         data: &[u8],
+        write_flags: u32,
         flags: u32,
     ) -> Result<ReplyWrite> {
         let path = self
@@ -589,6 +590,7 @@ where
                 fh,
                 offset,
                 data,
+                write_flags,
                 flags,
             )
             .await

src/path/path_filesystem.rs

@@ -194,14 +194,18 @@ pub trait PathFilesystem {
     /// exception to this is when the file has been opened in `direct_io` mode, in which case the
     /// return value of the write system call will reflect the return value of this operation. `fh`
     /// will contain the value set by the open method, or will be undefined if the open method
-    /// didn't set any value. when `path` is None, it means the path may be deleted.
+    /// didn't set any value. When `path` is None, it means the path may be deleted. When
+    /// `write_flags` contains [`FUSE_WRITE_CACHE`](crate::raw::flags::FUSE_WRITE_CACHE), means the
+    /// write operation is a delay write.
+    #[allow(clippy::too_many_arguments)]
     async fn write(
         &self,
         req: Request,
         path: Option<&OsStr>,
         fh: u64,
         offset: u64,
         data: &[u8],
+        write_flags: u32,
         flags: u32,
     ) -> Result<ReplyWrite> {
         Err(libc::ENOSYS.into())

src/raw/filesystem.rs

@@ -184,14 +184,18 @@ pub trait Filesystem {
     /// exception to this is when the file has been opened in `direct_io` mode, in which case the
     /// return value of the write system call will reflect the return value of this operation. `fh`
     /// will contain the value set by the open method, or will be undefined if the open method
-    /// didn't set any value.
+    /// didn't set any value. When `write_flags` contains
+    /// [`FUSE_WRITE_CACHE`](crate::raw::flags::FUSE_WRITE_CACHE), means the write operation is a
+    /// delay write.
+    #[allow(clippy::too_many_arguments)]
     async fn write(
         &self,
         req: Request,
         inode: Inode,
         fh: u64,
         offset: u64,
         data: &[u8],
+        write_flags: u32,
         flags: u32,
     ) -> Result<ReplyWrite> {
         Err(libc::ENOSYS.into())

src/raw/flags.rs

@@ -0,0 +1,12 @@
+//! request flags.
+
+pub use crate::raw::abi::FUSE_IOCTL_32BIT;
+pub use crate::raw::abi::FUSE_IOCTL_COMPAT;
+pub use crate::raw::abi::FUSE_IOCTL_DIR;
+pub use crate::raw::abi::FUSE_IOCTL_MAX_IOV;
+pub use crate::raw::abi::FUSE_IOCTL_RETRY;
+pub use crate::raw::abi::FUSE_IOCTL_UNRESTRICTED;
+pub use crate::raw::abi::FUSE_POLL_SCHEDULE_NOTIFY;
+pub use crate::raw::abi::FUSE_READ_LOCKOWNER;
+pub use crate::raw::abi::FUSE_WRITE_CACHE;
+pub use crate::raw::abi::FUSE_WRITE_LOCKOWNER;

src/raw/mod.rs

@@ -14,6 +14,7 @@ pub use session::{MountHandle, Session};
 pub(crate) mod abi;
 mod connection;
 mod filesystem;
+pub mod flags;
 pub mod reply;
 mod request;
 pub(crate) mod session;

src/raw/session.rs

@@ -1873,6 +1873,7 @@ impl<FS: Filesystem + Send + Sync + 'static> Session<FS> {
                     write_in.fh,
                     write_in.offset,
                     &data,
+                    write_in.write_flags,
                     write_in.flags,
                 )
                 .await