Skip to content

Commit 294fabd

Browse files
authored
Merge pull request #1047 from cagatay-y/fuse-refactor-2
Refactor FUSE
2 parents 34ce81b + bd900cd commit 294fabd

File tree

4 files changed

+857
-1126
lines changed

4 files changed

+857
-1126
lines changed

src/drivers/fs/virtio_fs.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,13 @@ impl VirtioFsDriver {
153153
}
154154

155155
impl FuseInterface for VirtioFsDriver {
156-
fn send_command<S, T>(&mut self, cmd: &fuse::Cmd<S>, rsp: &mut fuse::Rsp<T>)
157-
where
158-
S: fuse::FuseIn + core::fmt::Debug,
159-
T: fuse::FuseOut + core::fmt::Debug,
160-
{
156+
fn send_command<O: fuse::ops::Op>(&mut self, cmd: &fuse::Cmd<O>, rsp: &mut fuse::Rsp<O>) {
161157
if let Some(mut buff_tkn) = self.ready_queue.pop() {
162158
let cmd_len = Some(cmd.len());
163159
let rsp_len = Some(rsp.len());
164160
buff_tkn.restr_size(cmd_len, rsp_len).unwrap();
165161

166-
let transfer_tkn = buff_tkn.write(Some(cmd), Some(rsp)).unwrap();
162+
let transfer_tkn = buff_tkn.write(Some(cmd), None::<&fuse::Rsp<O>>).unwrap();
167163
let transfer = transfer_tkn.dispatch_blocking().unwrap();
168164
let (_, response) = transfer.ret_cpy().unwrap();
169165
let tkn = transfer.reuse().unwrap();

0 commit comments

Comments
 (0)