Add missing request accessors

1 files changed, 63 insertions, 9 deletions

diff --git a/src/fuse/ops.rs b/src/fuse/ops.rs
index 1a5a578..66708ad 100644
--- a/src/fuse/ops.rs
+++ b/src/fuse/ops.rs
@@ -96,6 +96,19 @@ op! {
         type ReplyTail = ();
     }
 
+    impl Request {
+        pub fn forget_list(&self) -> impl '_ + Iterator<Item = (Ino, u64)> {
+            use proto::OpcodeSelect::*;
+
+            let slice = match self.body {
+                Match((_, slice)) => slice,
+                Alt(single) => std::slice::from_ref(single),
+            };
+
+            slice.iter().map(|forget| (Ino(forget.ino), forget.nlookup))
+        }
+    }
+
     impl Reply {
         pub fn ok(self) -> Done<'o> {
             // No reply for forget requests
@@ -110,6 +123,12 @@ op! {
         type ReplyTail = ();
     }
 
+    impl Request {
+        pub fn handle(&self) -> u64 {
+            self.body.fh
+        }
+    }
+
     impl Reply {
         pub fn known(self, inode: &impl Known) -> Done<'o> {
             let (attrs, ttl) = inode.attrs();
@@ -175,16 +194,44 @@ op! {
 
 op! {
     Read {
-        type RequestBody = ();
+        type RequestBody = &'o proto::ReadIn;
         type ReplyTail = ();
     }
+
+    impl Request {
+        pub fn handle(&self) -> u64 {
+            self.body.fh
+        }
+
+        pub fn offset(&self) -> u64 {
+            self.body.offset
+        }
+
+        pub fn size(&self) -> u32 {
+            self.body.size
+        }
+    }
 }
 
 op! {
     Write {
-        type RequestBody = &'o proto::WriteIn;
+        type RequestBody = (&'o proto::WriteIn, &'o [u8]);
         type ReplyTail = ();
     }
+
+    impl Request {
+        pub fn handle(&self) -> u64 {
+            self.body.0.fh
+        }
+
+        pub fn offset(&self) -> u64 {
+            self.body.0.offset
+        }
+
+        pub fn data(&self) -> &[u8] {
+            self.body.1
+        }
+    }
 }
 
 op! {
@@ -250,6 +297,12 @@ op! {
         type RequestBody = &'o proto::ReleaseIn;
         type ReplyTail = ();
     }
+
+    impl Request {
+        pub fn handle(&self) -> u64 {
+            self.body.fh
+        }
+    }
 }
 
 op! {
@@ -266,10 +319,18 @@ op! {
     }
 
     impl Request {
+        pub fn handle(&self) -> u64 {
+            self.body.read_in.fh
+        }
+
         /// Returns the base offset in the directory stream to read from.
         pub fn offset(&self) -> u64 {
             self.body.read_in.offset
         }
+
+        pub fn size(&self) -> u32 {
+            self.body.read_in.size
+        }
     }
 
     impl Reply {
@@ -316,13 +377,6 @@ op! {
     }
 }
 
-op! {
-    Destroy {
-        type RequestBody = ();
-        type ReplyTail = ();
-    }
-}
-
 pub(crate) mod state {
     use crate::proto;