Merge rename() & rename2() methods

This is how libfuse handles it, and it reduces implementor complexity
siscia · Nov 15, 2020 · 2e9968d · 2e9968d
1 parent ef0a689
commit 2e9968d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/examples/simple.rs b/examples/simple.rs
@@ -887,6 +887,7 @@ impl Filesystem for SimpleFS {
         name: &OsStr,
         new_parent: u64,
         new_name: &OsStr,
+        _flags: u32,
         reply: ReplyEmpty,
     ) {
         let name_str = if let Some(value) = name.to_str() {

diff --git a/src/lib.rs b/src/lib.rs
@@ -224,19 +224,6 @@ pub trait Filesystem {
 
     /// Rename a file.
     fn rename(
-        &mut self,
-        _req: &Request<'_>,
-        _parent: u64,
-        _name: &OsStr,
-        _newparent: u64,
-        _newname: &OsStr,
-        reply: ReplyEmpty,
-    ) {
-        reply.error(ENOSYS);
-    }
-
-    /// Rename a file.
-    fn rename2(
         &mut self,
         _req: &Request<'_>,
         _parent: u64,

diff --git a/src/request.rs b/src/request.rs
@@ -291,6 +291,7 @@ impl<'a> Request<'a> {
                     &name,
                     arg.newdir,
                     &newname,
+                    0,
                     self.reply(),
                 );
             }
@@ -541,7 +542,7 @@ impl<'a> Request<'a> {
             }
             #[cfg(feature = "abi-7-23")]
             ll::Operation::Rename2 { arg, name, newname } => {
-                se.filesystem.rename2(
+                se.filesystem.rename(
                     self,
                     self.request.nodeid(),
                     name,