ptfs: optimize implementation of open_inode()

Optimize implementation of open_inode() by avoid double opening
in case for FileHandle.

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

Author: jiangliu

src/passthrough/mod.rs

@@ -109,6 +109,13 @@ impl InodeHandle {
         }
     }
 
+    fn open_file(&self, flags: libc::c_int, proc_self_fd: &File) -> io::Result<File> {
+        match self {
+            InodeHandle::File(f) => reopen_fd_through_proc(f, flags, proc_self_fd),
+            InodeHandle::Handle(h) => h.open(flags),
+        }
+    }
+
     fn stat(&self) -> io::Result<libc::stat64> {
         match self {
             InodeHandle::File(f) => stat_fd(f, None),
@@ -146,6 +153,10 @@ impl InodeData {
     fn get_file(&self) -> io::Result<InodeFile<'_>> {
         self.handle.get_file()
     }
+
+    fn open_file(&self, flags: libc::c_int, proc_self_fd: &File) -> io::Result<File> {
+        self.handle.open_file(flags, proc_self_fd)
+    }
 }
 
 /// Data structures to manage accessed inodes.

src/passthrough/sync_io.rs

@@ -30,14 +30,12 @@ use crate::transport::FsCacheReqHandler;
 
 impl<S: BitmapSlice + Send + Sync> PassthroughFs<S> {
     fn open_inode(&self, inode: Inode, flags: i32) -> io::Result<File> {
-        let new_flags = self.get_writeback_open_flags(flags);
         let data = self.inode_map.get(inode)?;
         if !is_safe_inode(data.mode) {
             Err(ebadf())
         } else {
-            // TODO: optimize
-            let file = data.get_file()?;
-            reopen_fd_through_proc(&file, new_flags | libc::O_CLOEXEC, &self.proc_self_fd)
+            let new_flags = self.get_writeback_open_flags(flags);
+            data.open_file(new_flags | libc::O_CLOEXEC, &self.proc_self_fd)
         }
     }
 
@@ -418,11 +416,11 @@ impl<S: BitmapSlice + Send + Sync> FileSystem for PassthroughFs<S> {
             // Safe because this doesn't modify any memory and we check the return value.
             unsafe { libc::mkdirat(file.as_raw_fd(), name.as_ptr(), mode & !umask) }
         };
-        if res == 0 {
-            self.do_lookup(parent, name)
-        } else {
-            Err(io::Error::last_os_error())
+        if res < 0 {
+            return Err(io::Error::last_os_error());
         }
+
+        self.do_lookup(parent, name)
     }
 
     fn rmdir(&self, _ctx: &Context, parent: Inode, name: &CStr) -> io::Result<()> {