Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor FUSE #1047

Merged
merged 11 commits into from
Feb 15, 2024
Merged

Refactor FUSE #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ff3d2c
fuse: move ABI definitions to a separate module
cagatay-y Feb 3, 2024
e093de4
fuse: follow Rust naming convention
cagatay-y Feb 3, 2024
24c425b
fuse: specify in/out structs of ops in type system
cagatay-y Feb 3, 2024
fbb5789
fuse: don't fill in the Rsp skeleton
cagatay-y Feb 3, 2024
a2212c0
fuse: simplify Cmd creation
cagatay-y Feb 4, 2024
3a93d4a
fuse: simplify Rsp allocation
cagatay-y Feb 4, 2024
f13bf48
fuse: associate creation functions with structs
cagatay-y Feb 4, 2024
4146a33
fuse: remove unused marker trait
cagatay-y Feb 13, 2024
92bf4c1
fuse: use empty structs instead of const generic
cagatay-y Feb 13, 2024
93fc6cb
fuse: remove dependency on unstable ptr_metadata
cagatay-y Feb 14, 2024
bd900cd
fuse: remove dependency on unstable maybe_uninit_write_slice
cagatay-y Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/drivers/fs/virtio_fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,13 @@ impl VirtioFsDriver {
}

impl FuseInterface for VirtioFsDriver {
fn send_command<S, T>(&mut self, cmd: &fuse::Cmd<S>, rsp: &mut fuse::Rsp<T>)
where
S: fuse::FuseIn + core::fmt::Debug,
T: fuse::FuseOut + core::fmt::Debug,
{
fn send_command<O: fuse::ops::Op>(&mut self, cmd: &fuse::Cmd<O>, rsp: &mut fuse::Rsp<O>) {
if let Some(mut buff_tkn) = self.ready_queue.pop() {
let cmd_len = Some(cmd.len());
let rsp_len = Some(rsp.len());
buff_tkn.restr_size(cmd_len, rsp_len).unwrap();

let transfer_tkn = buff_tkn.write(Some(cmd), Some(rsp)).unwrap();
let transfer_tkn = buff_tkn.write(Some(cmd), None::<&fuse::Rsp<O>>).unwrap();
let transfer = transfer_tkn.dispatch_blocking().unwrap();
let (_, response) = transfer.ret_cpy().unwrap();
let tkn = transfer.reuse().unwrap();
Expand Down
Loading