diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-01-04 06:23:02 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-01-04 06:23:04 -0600 |
| commit | c3c7a5b25a47e54df5d6b887d19f23c6fb20be8b (patch) | |
| tree | 7edf6f3a6c4ae2fd0fb6f8cb4139c80f0a365e01 | |
| parent | 47cda6cd90d40a1b550d55f7181b34c21508c2fb (diff) | |
Split crate::fuse::ops into submodules
| -rw-r--r-- | src/fuse/ops.rs | 834 | ||||
| -rw-r--r-- | src/fuse/ops/dir.rs | 253 | ||||
| -rw-r--r-- | src/fuse/ops/entry.rs | 80 | ||||
| -rw-r--r-- | src/fuse/ops/global.rs | 88 | ||||
| -rw-r--r-- | src/fuse/ops/mod.rs | 68 | ||||
| -rw-r--r-- | src/fuse/ops/open.rs | 131 | ||||
| -rw-r--r-- | src/fuse/ops/rw.rs | 123 | ||||
| -rw-r--r-- | src/fuse/ops/xattr.rs | 139 | ||||
| -rw-r--r-- | src/fuse/session.rs | 2 |
9 files changed, 883 insertions, 835 deletions
diff --git a/src/fuse/ops.rs b/src/fuse/ops.rs deleted file mode 100644 index 6f37c3f..0000000 --- a/src/fuse/ops.rs +++ /dev/null @@ -1,834 +0,0 @@ -use std::{ - convert::Infallible, - ffi::{CStr, OsStr}, - marker::PhantomData, - os::unix::ffi::OsStrExt, -}; - -use crate::{ - proto, - util::{page_size, OutputChain}, - Errno, Ino, Ttl, -}; - -use super::{ - io::{AccessFlags, Entry, EntryType, FsInfo, Interruptible, Known, OpenFlags, Stat}, - private_trait::Sealed, - Done, Operation, Reply, Request, -}; - -use bytemuck::{bytes_of, Pod, Zeroable}; -use bytes::BufMut; -use nix::sys::stat::SFlag; - -pub trait FromRequest<'o, O: Operation<'o>> { - //TODO: Shouldn't be public - fn from_request(request: &Request<'o, O>) -> Self; -} - -pub enum Any {} -pub enum Lookup {} -pub enum Forget {} -pub enum Getattr {} -pub enum Readlink {} -pub enum Open {} -pub enum Read {} -pub enum Write {} -pub enum Init {} -pub enum Statfs {} -pub enum Release {} -pub enum Setxattr {} -pub enum Getxattr {} -pub enum Listxattr {} -pub enum Removexattr {} -pub enum Flush {} -pub enum Opendir {} -pub enum Readdir {} -pub struct BufferedReaddir<B>(Infallible, PhantomData<B>); -pub enum Releasedir {} -pub enum Access {} - -impl Sealed for Any {} -impl Sealed for Lookup {} -impl Sealed for Forget {} -impl Sealed for Getattr {} -impl Sealed for Readlink {} -impl Sealed for Open {} -impl Sealed for Read {} -impl Sealed for Write {} -impl Sealed for Init {} -impl Sealed for Statfs {} -impl Sealed for Release {} -impl Sealed for Setxattr {} -impl Sealed for Getxattr {} -impl Sealed for Listxattr {} -impl Sealed for Removexattr {} -impl Sealed for Flush {} -impl Sealed for Opendir {} -impl Sealed for Readdir {} -impl<B> Sealed for BufferedReaddir<B> {} -impl Sealed for Releasedir {} -impl Sealed for Access {} - -impl<'o> Operation<'o> for Any { - type RequestBody = (); - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Lookup { - type RequestBody = &'o CStr; // name() - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Forget { - type RequestBody = proto::OpcodeSelect< - (&'o proto::BatchForgetIn, &'o [proto::ForgetOne]), - &'o proto::ForgetIn, - { proto::Opcode::BatchForget as u32 }, - >; - - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Getattr { - type RequestBody = &'o proto::GetattrIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Readlink { - type RequestBody = (); - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Open { - type RequestBody = &'o proto::OpenIn; - type ReplyTail = proto::OpenOutFlags; -} - -impl<'o> Operation<'o> for Read { - type RequestBody = &'o proto::ReadIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Write { - type RequestBody = (&'o proto::WriteIn, &'o [u8]); - type ReplyTail = state::Write; -} - -impl<'o> Operation<'o> for Init { - type RequestBody = &'o proto::InitIn; - type ReplyTail = state::Init; -} - -impl<'o> Operation<'o> for Statfs { - type RequestBody = (); - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Release { - type RequestBody = &'o proto::ReleaseIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Setxattr { - // header, name, value - type RequestBody = (&'o proto::SetxattrIn, &'o CStr, &'o [u8]); - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Getxattr { - type RequestBody = (&'o proto::GetxattrIn, &'o CStr); - type ReplyTail = state::ReadXattr; -} - -impl<'o> Operation<'o> for Listxattr { - type RequestBody = &'o proto::ListxattrIn; - type ReplyTail = state::ReadXattr; -} - -impl<'o> Operation<'o> for Removexattr { - type RequestBody = &'o CStr; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Flush { - type RequestBody = &'o proto::FlushIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Opendir { - type RequestBody = &'o proto::OpendirIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Readdir { - type RequestBody = proto::OpcodeSelect< - &'o proto::ReaddirPlusIn, - &'o proto::ReaddirIn, - { proto::Opcode::ReaddirPlus as u32 }, - >; - - type ReplyTail = state::Readdir<()>; -} - -impl<'o> Operation<'o> for Releasedir { - type RequestBody = &'o proto::ReleasedirIn; - type ReplyTail = (); -} - -impl<'o> Operation<'o> for Access { - type RequestBody = &'o proto::AccessIn; - type ReplyTail = (); -} - -impl<'o, B> Operation<'o> for BufferedReaddir<B> { - type RequestBody = (); // Never actually created - type ReplyTail = state::Readdir<B>; -} - -impl<'o> Request<'o, Lookup> { - /// Returns the name of the entry being looked up in this directory. - pub fn name(&self) -> &OsStr { - c_to_os(self.body) - } -} - -impl<'o> Reply<'o, Lookup> { - /// The requested entry was found. The FUSE client will become aware of the found inode if - /// it wasn't before. This result may be cached by the client for up to the given TTL. - pub fn found(self, entry: impl Known, ttl: Ttl) -> Done<'o> { - let (attrs, attrs_ttl) = entry.inode().attrs(); - let attrs = attrs.finish(entry.inode()); - - let done = self.single(&make_entry((entry.inode().ino(), ttl), (attrs, attrs_ttl))); - entry.unveil(); - - done - } - - /// The requested entry was not found in this directory. The FUSE clint may include this - /// response in negative cache for up to the given TTL. - pub fn not_found(self, ttl: Ttl) -> Done<'o> { - self.single(&make_entry( - (Ino::NULL, ttl), - (Zeroable::zeroed(), Ttl::NULL), - )) - } - - /// The requested entry was not found in this directory, but unlike [`Reply::not_found()`] - /// this does not report back a TTL to the FUSE client. The client should not cache the - /// response. - pub fn not_found_uncached(self) -> Done<'o> { - self.fail(Errno::ENOENT) - } -} - -impl<'o> Request<'o, Forget> { - pub fn forget_list(&self) -> impl '_ + Iterator<Item = (Ino, u64)> { - use proto::OpcodeSelect::*; - - enum List<'a> { - Single(Option<(Ino, u64)>), - Batch(std::slice::Iter<'a, proto::ForgetOne>), - } - - impl Iterator for List<'_> { - type Item = (Ino, u64); - - fn next(&mut self) -> Option<Self::Item> { - match self { - List::Single(single) => single.take(), - List::Batch(batch) => { - let forget = batch.next()?; - Some((Ino(forget.ino), forget.nlookup)) - } - } - } - } - - match self.body { - Match((_, slice)) => List::Batch(slice.iter()), - Alt(single) => List::Single(Some((self.ino(), single.nlookup))), - } - } -} - -impl<'o> Reply<'o, Forget> { - pub fn ok(self) -> Done<'o> { - // No reply for forget requests - Done::new() - } -} - -impl<'o> Request<'o, Getattr> { - pub fn handle(&self) -> u64 { - self.body.fh - } -} - -impl<'o> Reply<'o, Getattr> { - pub fn known(self, inode: &impl Stat) -> Done<'o> { - let (attrs, ttl) = inode.attrs(); - let attrs = attrs.finish(inode); - - self.single(&proto::AttrOut { - attr_valid: ttl.seconds, - attr_valid_nsec: ttl.nanoseconds, - dummy: Default::default(), - attr: attrs, - }) - } -} - -impl<'o> Reply<'o, Readlink> { - /// This inode corresponds to a symbolic link pointing to the given target path. - pub fn target<T: AsRef<OsStr>>(self, target: T) -> Done<'o> { - self.chain(OutputChain::tail(&[target.as_ref().as_bytes()])) - } - - /// Same as [`Reply::target()`], except that the target path is taken from disjoint - /// slices. This involves no additional allocation. - pub fn gather_target(self, target: &[&[u8]]) -> Done<'o> { - self.chain(OutputChain::tail(target)) - } -} - -impl<'o> Request<'o, Open> { - pub fn flags(&self) -> OpenFlags { - OpenFlags::from_bits_truncate(self.body.flags.try_into().unwrap_or_default()) - } -} - -impl<'o> Reply<'o, Open> { - pub fn force_direct_io(&mut self) { - self.tail |= proto::OpenOutFlags::DIRECT_IO; - } - - pub fn ok(self) -> Done<'o> { - self.ok_with_handle(0) - } - - pub fn ok_with_handle(self, handle: u64) -> Done<'o> { - let open_flags = self.tail.bits(); - - self.single(&proto::OpenOut { - fh: handle, - open_flags, - padding: Default::default(), - }) - } -} - -impl<'o> Request<'o, Read> { - pub fn handle(&self) -> u64 { - self.body.fh - } - - pub fn offset(&self) -> u64 { - self.body.offset - } - - pub fn size(&self) -> u32 { - self.body.size - } -} - -impl<'o> Reply<'o, Read> { - pub fn slice(self, data: &[u8]) -> Done<'o> { - self.chain(OutputChain::tail(&[data])) - } -} - -impl<'o> Request<'o, Write> { - 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 - } -} - -impl<'o> Reply<'o, Write> { - pub fn all(self) -> Done<'o> { - let size = self.tail.size; - self.single(&proto::WriteOut { - size, - padding: Default::default(), - }) - } -} - -impl<'o> Reply<'o, Init> { - pub fn ok(self) -> Done<'o> { - let state::Init { - kernel_flags, - buffer_pages, - } = self.tail; - - let flags = { - use proto::InitFlags; - - //TODO: Conditions for these feature flags - // - Locks - // - ASYNC_DIO - // - WRITEBACK_CACHE - // - NO_OPEN_SUPPORT - // - HANDLE_KILLPRIV - // - POSIX_ACL - // - NO_OPENDIR_SUPPORT - // - EXPLICIT_INVAL_DATA - - let supported = InitFlags::ASYNC_READ - | InitFlags::FILE_OPS - | InitFlags::ATOMIC_O_TRUNC - | InitFlags::EXPORT_SUPPORT - | InitFlags::BIG_WRITES - | InitFlags::HAS_IOCTL_DIR - | InitFlags::AUTO_INVAL_DATA - | InitFlags::DO_READDIRPLUS - | InitFlags::READDIRPLUS_AUTO - | InitFlags::PARALLEL_DIROPS - | InitFlags::ABORT_ERROR - | InitFlags::MAX_PAGES - | InitFlags::CACHE_SYMLINKS; - - kernel_flags & supported - }; - - let buffer_size = page_size() * buffer_pages; - - // See fs/fuse/dev.c in the kernel source tree for details about max_write - let max_write = buffer_size - std::mem::size_of::<(proto::InHeader, proto::WriteIn)>(); - - self.single(&proto::InitOut { - major: proto::MAJOR_VERSION, - minor: proto::TARGET_MINOR_VERSION, - max_readahead: 0, //TODO - flags: flags.bits(), - max_background: 0, //TODO - congestion_threshold: 0, //TODO - max_write: max_write.try_into().unwrap(), - time_gran: 1, //TODO - max_pages: buffer_pages.try_into().unwrap(), - padding: Default::default(), - unused: Default::default(), - }) - } -} - -impl<'o> Reply<'o, Statfs> { - /// Replies with filesystem statistics. - pub fn info(self, statfs: &FsInfo) -> Done<'o> { - self.single(&proto::StatfsOut::from(*statfs)) - } -} - -impl<'o> Request<'o, Release> { - pub fn handle(&self) -> u64 { - self.body.fh - } -} - -impl<'o> Reply<'o, Release> { - pub fn ok(self) -> Done<'o> { - self.empty() - } -} - -//TODO: flags -impl<'o> Request<'o, Setxattr> { - pub fn name(&self) -> &OsStr { - let (_header, name, _value) = self.body; - c_to_os(name) - } - - pub fn value(&self) -> &[u8] { - let (_header, _name, value) = self.body; - value - } -} - -impl<'o> Reply<'o, Setxattr> { - pub fn ok(self) -> Done<'o> { - self.empty() - } - - pub fn not_found(self) -> Done<'o> { - self.fail(Errno::ENODATA) - } -} - -impl<'o> Request<'o, Getxattr> { - pub fn size(&self) -> u32 { - self.body.0.size - } - - pub fn name(&self) -> &OsStr { - c_to_os(self.body.1) - } -} - -impl<'o> Reply<'o, Getxattr> { - pub fn slice(self, value: &[u8]) -> Done<'o> { - let size = value.len().try_into().expect("Extremely large xattr"); - if self.tail.size == 0 { - return self.value_size(size); - } else if self.tail.size < size { - return self.buffer_too_small(); - } - - self.chain(OutputChain::tail(&[value])) - } - - pub fn value_size(self, size: u32) -> Done<'o> { - assert_eq!(self.tail.size, 0); - - self.single(&proto::GetxattrOut { - size, - padding: Default::default(), - }) - } - - pub fn buffer_too_small(self) -> Done<'o> { - self.fail(Errno::ERANGE) - } - - pub fn not_found(self) -> Done<'o> { - self.fail(Errno::ENODATA) - } -} - -impl<'o> Request<'o, Listxattr> { - pub fn size(&self) -> u32 { - self.body.getxattr_in.size - } -} - -impl<'o> Reply<'o, Listxattr> { - //TODO: buffered(), gather() - - pub fn value_size(self, size: u32) -> Done<'o> { - assert_eq!(self.tail.size, 0); - - self.single(&proto::ListxattrOut { - getxattr_out: proto::GetxattrOut { - size, - padding: Default::default(), - }, - }) - } - - pub fn buffer_too_small(self) -> Done<'o> { - self.fail(Errno::ERANGE) - } -} - -impl<'o> Request<'o, Removexattr> { - pub fn name(&self) -> &OsStr { - c_to_os(self.body) - } -} - -impl<'o> Reply<'o, Removexattr> { - pub fn ok(self) -> Done<'o> { - self.empty() - } -} - -impl<'o> Request<'o, Flush> { - pub fn handle(&self) -> u64 { - self.body.fh - } -} - -impl<'o> Reply<'o, Flush> { - pub fn ok(self) -> Done<'o> { - self.empty() - } -} - -impl<'o> Reply<'o, Opendir> { - pub fn ok(self) -> Done<'o> { - self.ok_with_handle(0) - } - - pub fn ok_with_handle(self, handle: u64) -> Done<'o> { - self.single(&proto::OpenOut { - fh: handle, - open_flags: 0, - padding: Default::default(), - }) - } -} - -impl<'o> Request<'o, Readdir> { - pub fn handle(&self) -> u64 { - self.read_in().fh - } - - /// Returns the base offset in the directory stream to read from. - pub fn offset(&self) -> u64 { - self.read_in().offset - } - - pub fn size(&self) -> u32 { - self.read_in().size - } - - fn read_in(&self) -> &proto::ReadIn { - use proto::OpcodeSelect::*; - - match &self.body { - Match(readdir_plus) => &readdir_plus.read_in, - Alt(readdir) => &readdir.read_in, - } - } -} - -impl<'o> Reply<'o, Readdir> { - pub fn buffered<B>(self, buffer: B) -> Reply<'o, BufferedReaddir<B>> - where - B: BufMut + AsRef<[u8]>, - { - assert!(buffer.as_ref().is_empty()); - - let state::Readdir { - max_read, - is_plus, - buffer: (), - } = self.tail; - - Reply { - session: self.session, - unique: self.unique, - tail: state::Readdir { - max_read, - is_plus, - buffer, - }, - } - } -} - -impl<'o, B: BufMut + AsRef<[u8]>> Reply<'o, BufferedReaddir<B>> { - pub fn entry(mut self, entry: Entry<impl Known>) -> Interruptible<'o, BufferedReaddir<B>, ()> { - let entry_header_len = if self.tail.is_plus { - std::mem::size_of::<proto::DirentPlus>() - } else { - std::mem::size_of::<proto::Dirent>() - }; - - let name = entry.name.as_bytes(); - let padding_len = dirent_pad_bytes(entry_header_len + name.len()); - - let buffer = &mut self.tail.buffer; - let remaining = buffer - .remaining_mut() - .min(self.tail.max_read - buffer.as_ref().len()); - - let record_len = entry_header_len + name.len() + padding_len; - if remaining < record_len { - if buffer.as_ref().is_empty() { - log::error!("Buffer for readdir req #{} is too small", self.unique); - return Interruptible::Interrupted(self.fail(Errno::ENOBUFS)); - } - - return Interruptible::Interrupted(self.end()); - } - - let inode = entry.inode.inode(); - let entry_type = match inode.inode_type() { - EntryType::Fifo => SFlag::S_IFIFO, - EntryType::CharacterDevice => SFlag::S_IFCHR, - EntryType::Directory => SFlag::S_IFDIR, - EntryType::BlockDevice => SFlag::S_IFBLK, - EntryType::File => SFlag::S_IFREG, - EntryType::Symlink => SFlag::S_IFLNK, - EntryType::Socket => SFlag::S_IFSOCK, - }; - - let ino = inode.ino(); - let dirent = proto::Dirent { - ino: ino.as_raw(), - off: entry.offset, - namelen: name.len().try_into().unwrap(), - entry_type: entry_type.bits() >> 12, - }; - - enum Ent { - Dirent(proto::Dirent), - DirentPlus(proto::DirentPlus), - } - - let ent = if self.tail.is_plus { - let (attrs, attrs_ttl) = inode.attrs(); - let attrs = attrs.finish(inode); - let entry_out = make_entry((ino, entry.ttl), (attrs, attrs_ttl)); - - if name != ".".as_bytes() && name != "..".as_bytes() { - entry.inode.unveil(); - } - - Ent::DirentPlus(proto::DirentPlus { entry_out, dirent }) - } else { - Ent::Dirent(dirent) - }; - - let entry_header = match &ent { - Ent::Dirent(dirent) => bytes_of(dirent), - Ent::DirentPlus(dirent_plus) => bytes_of(dirent_plus), - }; - - buffer.put_slice(entry_header); - buffer.put_slice(name); - buffer.put_slice(&[0; 7][..padding_len]); - - if remaining - record_len >= entry_header.len() + (1 << proto::DIRENT_ALIGNMENT_BITS) { - Interruptible::Completed(self, ()) - } else { - Interruptible::Interrupted(self.end()) - } - } - - pub fn end(self) -> Done<'o> { - self.inner(|this| this.tail.buffer.as_ref()) - } -} - -impl<'o> Request<'o, Releasedir> { - pub fn handle(&self) -> u64 { - self.body.release_in.fh - } -} - -impl<'o> Reply<'o, Releasedir> { - pub fn ok(self) -> Done<'o> { - self.empty() - } -} - -impl<'o> Request<'o, Access> { - pub fn mask(&self) -> AccessFlags { - AccessFlags::from_bits_truncate(self.body.mask as i32) - } -} - -impl<'o> Reply<'o, Access> { - pub fn ok(self) -> Done<'o> { - self.empty() - } - - pub fn permission_denied(self) -> Done<'o> { - self.fail(Errno::EACCES) - } -} - -pub(crate) mod state { - use crate::proto; - - pub struct Init { - pub kernel_flags: proto::InitFlags, - pub buffer_pages: usize, - } - - pub struct Readdir<B> { - pub(super) max_read: usize, - pub(super) is_plus: bool, - pub(super) buffer: B, - } - - pub struct Write { - pub(super) size: u32, - } - - pub struct ReadXattr { - pub(super) size: u32, - } -} - -impl<'o, O: Operation<'o>> FromRequest<'o, O> for () { - fn from_request(_request: &Request<'o, O>) -> Self {} -} - -impl<'o> FromRequest<'o, Open> for proto::OpenOutFlags { - fn from_request(_request: &Request<'o, Open>) -> Self { - proto::OpenOutFlags::empty() - } -} - -impl<'o> FromRequest<'o, Write> for state::Write { - fn from_request(request: &Request<'o, Write>) -> Self { - let (body, data) = request.body; - - if body.size as usize != data.len() { - log::warn!( - "Write size={} differs from data.len={}", - body.size, - data.len() - ); - } - - state::Write { size: body.size } - } -} - -impl<'o> FromRequest<'o, Readdir> for state::Readdir<()> { - fn from_request(request: &Request<'o, Readdir>) -> Self { - state::Readdir { - max_read: request.size() as usize, - is_plus: matches!(request.body, proto::OpcodeSelect::Match(_)), - buffer: (), - } - } -} - -impl<'o, O: Operation<'o>> Reply<'o, O> { - fn empty(self) -> Done<'o> { - self.chain(OutputChain::empty()) - } - - fn single<P: Pod>(self, single: &P) -> Done<'o> { - self.chain(OutputChain::tail(&[bytes_of(single)])) - } - - fn inner(self, deref: impl FnOnce(&Self) -> &[u8]) -> Done<'o> { - let result = self - .session - .ok(self.unique, OutputChain::tail(&[deref(&self)])); - self.finish(result) - } - - fn chain(self, chain: OutputChain<'_>) -> Done<'o> { - let result = self.session.ok(self.unique, chain); - self.finish(result) - } -} - -fn make_entry( - (Ino(ino), entry_ttl): (Ino, Ttl), - (attrs, attr_ttl): (proto::Attrs, Ttl), -) -> proto::EntryOut { - proto::EntryOut { - nodeid: ino, - generation: 0, //TODO - entry_valid: entry_ttl.seconds, - attr_valid: attr_ttl.seconds, - entry_valid_nsec: entry_ttl.nanoseconds, - attr_valid_nsec: attr_ttl.nanoseconds, - attr: attrs, - } -} - -fn dirent_pad_bytes(entry_len: usize) -> usize { - const ALIGN_MASK: usize = (1 << proto::DIRENT_ALIGNMENT_BITS) - 1; - ((entry_len + ALIGN_MASK) & !ALIGN_MASK) - entry_len -} - -fn c_to_os(c_str: &CStr) -> &OsStr { - OsStr::from_bytes(c_str.to_bytes()) -} diff --git a/src/fuse/ops/dir.rs b/src/fuse/ops/dir.rs new file mode 100644 index 0000000..76267ec --- /dev/null +++ b/src/fuse/ops/dir.rs @@ -0,0 +1,253 @@ +use std::{ + convert::Infallible, + ffi::{CStr, OsStr}, + marker::PhantomData, + os::unix::ffi::OsStrExt, +}; + +use crate::fuse::{ + io::{Entry, EntryType, Interruptible, Known, Stat}, + private_trait::Sealed, + Done, Operation, Reply, Request, +}; + +use super::{c_to_os, FromRequest}; +use crate::{proto, Errno, Ino, Ttl}; +use bytemuck::{bytes_of, Zeroable}; +use bytes::BufMut; +use nix::sys::stat::SFlag; + +pub enum Lookup {} +pub enum Readdir {} +pub struct BufferedReaddir<B>(Infallible, PhantomData<B>); + +pub struct ReaddirState<B> { + max_read: usize, + is_plus: bool, + buffer: B, +} + +impl Sealed for Lookup {} +impl Sealed for Readdir {} +impl<B> Sealed for BufferedReaddir<B> {} + +impl<'o> Operation<'o> for Lookup { + type RequestBody = &'o CStr; // name() + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Readdir { + type RequestBody = proto::OpcodeSelect< + &'o proto::ReaddirPlusIn, + &'o proto::ReaddirIn, + { proto::Opcode::ReaddirPlus as u32 }, + >; + + type ReplyTail = ReaddirState<()>; +} + +impl<'o, B> Operation<'o> for BufferedReaddir<B> { + type RequestBody = (); // Never actually created + type ReplyTail = ReaddirState<B>; +} + +impl<'o> Request<'o, Lookup> { + /// Returns the name of the entry being looked up in this directory. + pub fn name(&self) -> &OsStr { + c_to_os(self.body) + } +} + +impl<'o> Reply<'o, Lookup> { + /// The requested entry was found. The FUSE client will become aware of the found inode if + /// it wasn't before. This result may be cached by the client for up to the given TTL. + pub fn found(self, entry: impl Known, ttl: Ttl) -> Done<'o> { + let (attrs, attrs_ttl) = entry.inode().attrs(); + let attrs = attrs.finish(entry.inode()); + + let done = self.single(&make_entry((entry.inode().ino(), ttl), (attrs, attrs_ttl))); + entry.unveil(); + + done + } + + /// The requested entry was not found in this directory. The FUSE clint may include this + /// response in negative cache for up to the given TTL. + pub fn not_found(self, ttl: Ttl) -> Done<'o> { + self.single(&make_entry( + (Ino::NULL, ttl), + (Zeroable::zeroed(), Ttl::NULL), + )) + } + + /// The requested entry was not found in this directory, but unlike [`Reply::not_found()`] + /// this does not report back a TTL to the FUSE client. The client should not cache the + /// response. + pub fn not_found_uncached(self) -> Done<'o> { + self.fail(Errno::ENOENT) + } +} + +impl<'o> Request<'o, Readdir> { + pub fn handle(&self) -> u64 { + self.read_in().fh + } + + /// Returns the base offset in the directory stream to read from. + pub fn offset(&self) -> u64 { + self.read_in().offset + } + + pub fn size(&self) -> u32 { + self.read_in().size + } + + fn read_in(&self) -> &proto::ReadIn { + use proto::OpcodeSelect::*; + + match &self.body { + Match(readdir_plus) => &readdir_plus.read_in, + Alt(readdir) => &readdir.read_in, + } + } +} + +impl<'o> Reply<'o, Readdir> { + pub fn buffered<B>(self, buffer: B) -> Reply<'o, BufferedReaddir<B>> + where + B: BufMut + AsRef<[u8]>, + { + assert!(buffer.as_ref().is_empty()); + + let ReaddirState { + max_read, + is_plus, + buffer: (), + } = self.tail; + + Reply { + session: self.session, + unique: self.unique, + tail: ReaddirState { + max_read, + is_plus, + buffer, + }, + } + } +} + +impl<'o, B: BufMut + AsRef<[u8]>> Reply<'o, BufferedReaddir<B>> { + pub fn entry(mut self, entry: Entry<impl Known>) -> Interruptible<'o, BufferedReaddir<B>, ()> { + let entry_header_len = if self.tail.is_plus { + std::mem::size_of::<proto::DirentPlus>() + } else { + std::mem::size_of::<proto::Dirent>() + }; + + let name = entry.name.as_bytes(); + let padding_len = dirent_pad_bytes(entry_header_len + name.len()); + + let buffer = &mut self.tail.buffer; + let remaining = buffer + .remaining_mut() + .min(self.tail.max_read - buffer.as_ref().len()); + + let record_len = entry_header_len + name.len() + padding_len; + if remaining < record_len { + if buffer.as_ref().is_empty() { + log::error!("Buffer for readdir req #{} is too small", self.unique); + return Interruptible::Interrupted(self.fail(Errno::ENOBUFS)); + } + + return Interruptible::Interrupted(self.end()); + } + + let inode = entry.inode.inode(); + let entry_type = match inode.inode_type() { + EntryType::Fifo => SFlag::S_IFIFO, + EntryType::CharacterDevice => SFlag::S_IFCHR, + EntryType::Directory => SFlag::S_IFDIR, + EntryType::BlockDevice => SFlag::S_IFBLK, + EntryType::File => SFlag::S_IFREG, + EntryType::Symlink => SFlag::S_IFLNK, + EntryType::Socket => SFlag::S_IFSOCK, + }; + + let ino = inode.ino(); + let dirent = proto::Dirent { + ino: ino.as_raw(), + off: entry.offset, + namelen: name.len().try_into().unwrap(), + entry_type: entry_type.bits() >> 12, + }; + + enum Ent { + Dirent(proto::Dirent), + DirentPlus(proto::DirentPlus), + } + + let ent = if self.tail.is_plus { + let (attrs, attrs_ttl) = inode.attrs(); + let attrs = attrs.finish(inode); + let entry_out = make_entry((ino, entry.ttl), (attrs, attrs_ttl)); + + if name != ".".as_bytes() && name != "..".as_bytes() { + entry.inode.unveil(); + } + + Ent::DirentPlus(proto::DirentPlus { entry_out, dirent }) + } else { + Ent::Dirent(dirent) + }; + + let entry_header = match &ent { + Ent::Dirent(dirent) => bytes_of(dirent), + Ent::DirentPlus(dirent_plus) => bytes_of(dirent_plus), + }; + + buffer.put_slice(entry_header); + buffer.put_slice(name); + buffer.put_slice(&[0; 7][..padding_len]); + + if remaining - record_len >= entry_header.len() + (1 << proto::DIRENT_ALIGNMENT_BITS) { + Interruptible::Completed(self, ()) + } else { + Interruptible::Interrupted(self.end()) + } + } + + pub fn end(self) -> Done<'o> { + self.inner(|this| this.tail.buffer.as_ref()) + } +} + +impl<'o> FromRequest<'o, Readdir> for ReaddirState<()> { + fn from_request(request: &Request<'o, Readdir>) -> Self { + ReaddirState { + max_read: request.size() as usize, + is_plus: matches!(request.body, proto::OpcodeSelect::Match(_)), + buffer: (), + } + } +} + +fn make_entry( + (Ino(ino), entry_ttl): (Ino, Ttl), + (attrs, attr_ttl): (proto::Attrs, Ttl), +) -> proto::EntryOut { + proto::EntryOut { + nodeid: ino, + generation: 0, //TODO + entry_valid: entry_ttl.seconds, + attr_valid: attr_ttl.seconds, + entry_valid_nsec: entry_ttl.nanoseconds, + attr_valid_nsec: attr_ttl.nanoseconds, + attr: attrs, + } +} + +fn dirent_pad_bytes(entry_len: usize) -> usize { + const ALIGN_MASK: usize = (1 << proto::DIRENT_ALIGNMENT_BITS) - 1; + ((entry_len + ALIGN_MASK) & !ALIGN_MASK) - entry_len +} diff --git a/src/fuse/ops/entry.rs b/src/fuse/ops/entry.rs new file mode 100644 index 0000000..9475a61 --- /dev/null +++ b/src/fuse/ops/entry.rs @@ -0,0 +1,80 @@ +use crate::{proto, Ino}; +use crate::fuse::{io::Stat, private_trait::Sealed, Done, Operation, Reply, Request}; + +pub enum Forget {} +pub enum Getattr {} + +impl Sealed for Forget {} +impl Sealed for Getattr {} + +impl<'o> Operation<'o> for Forget { + type RequestBody = proto::OpcodeSelect< + (&'o proto::BatchForgetIn, &'o [proto::ForgetOne]), + &'o proto::ForgetIn, + { proto::Opcode::BatchForget as u32 }, + >; + + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Getattr { + type RequestBody = &'o proto::GetattrIn; + type ReplyTail = (); +} + +impl<'o> Request<'o, Forget> { + pub fn forget_list(&self) -> impl '_ + Iterator<Item = (Ino, u64)> { + use proto::OpcodeSelect::*; + + enum List<'a> { + Single(Option<(Ino, u64)>), + Batch(std::slice::Iter<'a, proto::ForgetOne>), + } + + impl Iterator for List<'_> { + type Item = (Ino, u64); + + fn next(&mut self) -> Option<Self::Item> { + match self { + List::Single(single) => single.take(), + List::Batch(batch) => { + let forget = batch.next()?; + Some((Ino(forget.ino), forget.nlookup)) + } + } + } + } + + match self.body { + Match((_, slice)) => List::Batch(slice.iter()), + Alt(single) => List::Single(Some((self.ino(), single.nlookup))), + } + } +} + +impl<'o> Reply<'o, Forget> { + pub fn ok(self) -> Done<'o> { + // No reply for forget requests + Done::new() + } +} + +impl<'o> Request<'o, Getattr> { + pub fn handle(&self) -> u64 { + self.body.fh + } +} + +impl<'o> Reply<'o, Getattr> { + pub fn known(self, inode: &impl Stat) -> Done<'o> { + let (attrs, ttl) = inode.attrs(); + let attrs = attrs.finish(inode); + + self.single(&proto::AttrOut { + attr_valid: ttl.seconds, + attr_valid_nsec: ttl.nanoseconds, + dummy: Default::default(), + attr: attrs, + }) + } +} diff --git a/src/fuse/ops/global.rs b/src/fuse/ops/global.rs new file mode 100644 index 0000000..e2ecd7b --- /dev/null +++ b/src/fuse/ops/global.rs @@ -0,0 +1,88 @@ +use crate::{proto, util::page_size}; +use crate::fuse::{io::FsInfo, private_trait::Sealed, Done, Operation, Reply}; + +pub enum Init {} +pub enum Statfs {} + +pub struct InitState { + pub(crate) kernel_flags: proto::InitFlags, + pub(crate) buffer_pages: usize, +} + +impl Sealed for Init {} +impl Sealed for Statfs {} + +impl<'o> Operation<'o> for Init { + type RequestBody = &'o proto::InitIn; + type ReplyTail = InitState; +} + +impl<'o> Operation<'o> for Statfs { + type RequestBody = (); + type ReplyTail = (); +} + +impl<'o> Reply<'o, Init> { + pub fn ok(self) -> Done<'o> { + let InitState { + kernel_flags, + buffer_pages, + } = self.tail; + + let flags = { + use proto::InitFlags; + + //TODO: Conditions for these feature flags + // - Locks + // - ASYNC_DIO + // - WRITEBACK_CACHE + // - NO_OPEN_SUPPORT + // - HANDLE_KILLPRIV + // - POSIX_ACL + // - NO_OPENDIR_SUPPORT + // - EXPLICIT_INVAL_DATA + + let supported = InitFlags::ASYNC_READ + | InitFlags::FILE_OPS + | InitFlags::ATOMIC_O_TRUNC + | InitFlags::EXPORT_SUPPORT + | InitFlags::BIG_WRITES + | InitFlags::HAS_IOCTL_DIR + | InitFlags::AUTO_INVAL_DATA + | InitFlags::DO_READDIRPLUS + | InitFlags::READDIRPLUS_AUTO + | InitFlags::PARALLEL_DIROPS + | InitFlags::ABORT_ERROR + | InitFlags::MAX_PAGES + | InitFlags::CACHE_SYMLINKS; + + kernel_flags & supported + }; + + let buffer_size = page_size() * buffer_pages; + + // See fs/fuse/dev.c in the kernel source tree for details about max_write + let max_write = buffer_size - std::mem::size_of::<(proto::InHeader, proto::WriteIn)>(); + + self.single(&proto::InitOut { + major: proto::MAJOR_VERSION, + minor: proto::TARGET_MINOR_VERSION, + max_readahead: 0, //TODO + flags: flags.bits(), + max_background: 0, //TODO + congestion_threshold: 0, //TODO + max_write: max_write.try_into().unwrap(), + time_gran: 1, //TODO + max_pages: buffer_pages.try_into().unwrap(), + padding: Default::default(), + unused: Default::default(), + }) + } +} + +impl<'o> Reply<'o, Statfs> { + /// Replies with filesystem statistics. + pub fn info(self, statfs: &FsInfo) -> Done<'o> { + self.single(&proto::StatfsOut::from(*statfs)) + } +} diff --git a/src/fuse/ops/mod.rs b/src/fuse/ops/mod.rs new file mode 100644 index 0000000..39a4ef0 --- /dev/null +++ b/src/fuse/ops/mod.rs @@ -0,0 +1,68 @@ +use std::{ + ffi::{CStr, OsStr}, + os::unix::ffi::OsStrExt, +}; + +use crate::util::OutputChain; +use super::{private_trait::Sealed, Done, Operation, Reply, Request}; +use bytemuck::{bytes_of, Pod}; + +mod dir; +mod entry; +mod global; +mod open; +mod rw; +mod xattr; + +pub use dir::{BufferedReaddir, Lookup, Readdir}; +pub use entry::{Forget, Getattr}; +pub use global::{Init, Statfs}; +pub use open::{Access, Open, Opendir, Release, Releasedir}; +pub use rw::{Flush, Read, Readlink, Write}; +pub use xattr::{Getxattr, Listxattr, Removexattr, Setxattr}; + +pub(crate) use global::InitState; + +pub trait FromRequest<'o, O: Operation<'o>> { + //TODO: Shouldn't be public + fn from_request(request: &Request<'o, O>) -> Self; +} + +pub enum Any {} + +impl Sealed for Any {} + +impl<'o> Operation<'o> for Any { + type RequestBody = (); + type ReplyTail = (); +} + +impl<'o, O: Operation<'o>> FromRequest<'o, O> for () { + fn from_request(_request: &Request<'o, O>) -> Self {} +} + +impl<'o, O: Operation<'o>> Reply<'o, O> { + fn empty(self) -> Done<'o> { + self.chain(OutputChain::empty()) + } + + fn single<P: Pod>(self, single: &P) -> Done<'o> { + self.chain(OutputChain::tail(&[bytes_of(single)])) + } + + fn inner(self, deref: impl FnOnce(&Self) -> &[u8]) -> Done<'o> { + let result = self + .session + .ok(self.unique, OutputChain::tail(&[deref(&self)])); + self.finish(result) + } + + fn chain(self, chain: OutputChain<'_>) -> Done<'o> { + let result = self.session.ok(self.unique, chain); + self.finish(result) + } +} + +fn c_to_os(c_str: &CStr) -> &OsStr { + OsStr::from_bytes(c_str.to_bytes()) +} diff --git a/src/fuse/ops/open.rs b/src/fuse/ops/open.rs new file mode 100644 index 0000000..ff41d05 --- /dev/null +++ b/src/fuse/ops/open.rs @@ -0,0 +1,131 @@ +use crate::fuse::{ + io::{AccessFlags, OpenFlags}, + private_trait::Sealed, + Done, Operation, Reply, Request, +}; + +use crate::{proto, Errno}; +use super::FromRequest; + +pub enum Open {} +pub enum Release {} +pub enum Opendir {} +pub enum Releasedir {} +pub enum Access {} + +impl Sealed for Open {} +impl Sealed for Release {} +impl Sealed for Opendir {} +impl Sealed for Releasedir {} +impl Sealed for Access {} + +impl<'o> Operation<'o> for Open { + type RequestBody = &'o proto::OpenIn; + type ReplyTail = proto::OpenOutFlags; +} + +impl<'o> Operation<'o> for Release { + type RequestBody = &'o proto::ReleaseIn; + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Opendir { + type RequestBody = &'o proto::OpendirIn; + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Releasedir { + type RequestBody = &'o proto::ReleasedirIn; + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Access { + type RequestBody = &'o proto::AccessIn; + type ReplyTail = (); +} + +impl<'o> Request<'o, Open> { + pub fn flags(&self) -> OpenFlags { + OpenFlags::from_bits_truncate(self.body.flags.try_into().unwrap_or_default()) + } +} + +impl<'o> Reply<'o, Open> { + pub fn force_direct_io(&mut self) { + self.tail |= proto::OpenOutFlags::DIRECT_IO; + } + + pub fn ok(self) -> Done<'o> { + self.ok_with_handle(0) + } + + pub fn ok_with_handle(self, handle: u64) -> Done<'o> { + let open_flags = self.tail.bits(); + + self.single(&proto::OpenOut { + fh: handle, + open_flags, + padding: Default::default(), + }) + } +} + +impl<'o> Request<'o, Release> { + pub fn handle(&self) -> u64 { + self.body.fh + } +} + +impl<'o> Reply<'o, Release> { + pub fn ok(self) -> Done<'o> { + self.empty() + } +} + +impl<'o> Reply<'o, Opendir> { + pub fn ok(self) -> Done<'o> { + self.ok_with_handle(0) + } + + pub fn ok_with_handle(self, handle: u64) -> Done<'o> { + self.single(&proto::OpenOut { + fh: handle, + open_flags: 0, + padding: Default::default(), + }) + } +} + +impl<'o> Request<'o, Releasedir> { + pub fn handle(&self) -> u64 { + self.body.release_in.fh + } +} + +impl<'o> Reply<'o, Releasedir> { + pub fn ok(self) -> Done<'o> { + self.empty() + } +} + +impl<'o> Request<'o, Access> { + pub fn mask(&self) -> AccessFlags { + AccessFlags::from_bits_truncate(self.body.mask as i32) + } +} + +impl<'o> Reply<'o, Access> { + pub fn ok(self) -> Done<'o> { + self.empty() + } + + pub fn permission_denied(self) -> Done<'o> { + self.fail(Errno::EACCES) + } +} + +impl<'o> FromRequest<'o, Open> for proto::OpenOutFlags { + fn from_request(_request: &Request<'o, Open>) -> Self { + proto::OpenOutFlags::empty() + } +} diff --git a/src/fuse/ops/rw.rs b/src/fuse/ops/rw.rs new file mode 100644 index 0000000..726143b --- /dev/null +++ b/src/fuse/ops/rw.rs @@ -0,0 +1,123 @@ +use std::{ffi::OsStr, os::unix::ffi::OsStrExt}; +use crate::{proto, util::OutputChain}; +use crate::fuse::{private_trait::Sealed, Done, Operation, Reply, Request}; +use super::FromRequest; + +pub enum Readlink {} +pub enum Read {} +pub enum Write {} +pub enum Flush {} + +pub struct WriteState { + size: u32, +} + +impl Sealed for Readlink {} +impl Sealed for Read {} +impl Sealed for Write {} +impl Sealed for Flush {} + +impl<'o> Operation<'o> for Readlink { + type RequestBody = (); + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Read { + type RequestBody = &'o proto::ReadIn; + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Write { + type RequestBody = (&'o proto::WriteIn, &'o [u8]); + type ReplyTail = WriteState; +} + +impl<'o> Operation<'o> for Flush { + type RequestBody = &'o proto::FlushIn; + type ReplyTail = (); +} + +impl<'o> Reply<'o, Readlink> { + /// This inode corresponds to a symbolic link pointing to the given target path. + pub fn target<T: AsRef<OsStr>>(self, target: T) -> Done<'o> { + self.chain(OutputChain::tail(&[target.as_ref().as_bytes()])) + } + + /// Same as [`Reply::target()`], except that the target path is taken from disjoint + /// slices. This involves no additional allocation. + pub fn gather_target(self, target: &[&[u8]]) -> Done<'o> { + self.chain(OutputChain::tail(target)) + } +} + +impl<'o> Request<'o, Read> { + pub fn handle(&self) -> u64 { + self.body.fh + } + + pub fn offset(&self) -> u64 { + self.body.offset + } + + pub fn size(&self) -> u32 { + self.body.size + } +} + +impl<'o> Reply<'o, Read> { + pub fn slice(self, data: &[u8]) -> Done<'o> { + self.chain(OutputChain::tail(&[data])) + } +} + +impl<'o> Request<'o, Write> { + 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 + } +} + +impl<'o> Reply<'o, Write> { + pub fn all(self) -> Done<'o> { + let size = self.tail.size; + self.single(&proto::WriteOut { + size, + padding: Default::default(), + }) + } +} + +impl<'o> Request<'o, Flush> { + pub fn handle(&self) -> u64 { + self.body.fh + } +} + +impl<'o> Reply<'o, Flush> { + pub fn ok(self) -> Done<'o> { + self.empty() + } +} + +impl<'o> FromRequest<'o, Write> for WriteState { + fn from_request(request: &Request<'o, Write>) -> Self { + let (body, data) = request.body; + + if body.size as usize != data.len() { + log::warn!( + "Write size={} differs from data.len={}", + body.size, + data.len() + ); + } + + WriteState { size: body.size } + } +} diff --git a/src/fuse/ops/xattr.rs b/src/fuse/ops/xattr.rs new file mode 100644 index 0000000..48d10bf --- /dev/null +++ b/src/fuse/ops/xattr.rs @@ -0,0 +1,139 @@ +use std::ffi::{CStr, OsStr}; +use crate::{proto, util::OutputChain, Errno}; +use crate::fuse::{private_trait::Sealed, Done, Operation, Reply, Request}; +use super::c_to_os; + +pub enum Setxattr {} +pub enum Getxattr {} +pub enum Listxattr {} +pub enum Removexattr {} + +pub struct XattrReadState { + size: u32, +} + +impl Sealed for Setxattr {} +impl Sealed for Getxattr {} +impl Sealed for Listxattr {} +impl Sealed for Removexattr {} + +impl<'o> Operation<'o> for Setxattr { + // header, name, value + type RequestBody = (&'o proto::SetxattrIn, &'o CStr, &'o [u8]); + type ReplyTail = (); +} + +impl<'o> Operation<'o> for Getxattr { + type RequestBody = (&'o proto::GetxattrIn, &'o CStr); + type ReplyTail = XattrReadState; +} + +impl<'o> Operation<'o> for Listxattr { + type RequestBody = &'o proto::ListxattrIn; + type ReplyTail = XattrReadState; +} + +impl<'o> Operation<'o> for Removexattr { + type RequestBody = &'o CStr; + type ReplyTail = (); +} + +//TODO: flags +impl<'o> Request<'o, Setxattr> { + pub fn name(&self) -> &OsStr { + let (_header, name, _value) = self.body; + c_to_os(name) + } + + pub fn value(&self) -> &[u8] { + let (_header, _name, value) = self.body; + value + } +} + +impl<'o> Reply<'o, Setxattr> { + pub fn ok(self) -> Done<'o> { + self.empty() + } + + pub fn not_found(self) -> Done<'o> { + self.fail(Errno::ENODATA) + } +} + +impl<'o> Request<'o, Getxattr> { + pub fn size(&self) -> u32 { + self.body.0.size + } + + pub fn name(&self) -> &OsStr { + c_to_os(self.body.1) + } +} + +impl<'o> Reply<'o, Getxattr> { + pub fn slice(self, value: &[u8]) -> Done<'o> { + let size = value.len().try_into().expect("Extremely large xattr"); + if self.tail.size == 0 { + return self.value_size(size); + } else if self.tail.size < size { + return self.buffer_too_small(); + } + + self.chain(OutputChain::tail(&[value])) + } + + pub fn value_size(self, size: u32) -> Done<'o> { + assert_eq!(self.tail.size, 0); + + self.single(&proto::GetxattrOut { + size, + padding: Default::default(), + }) + } + + pub fn buffer_too_small(self) -> Done<'o> { + self.fail(Errno::ERANGE) + } + + pub fn not_found(self) -> Done<'o> { + self.fail(Errno::ENODATA) + } +} + +impl<'o> Request<'o, Listxattr> { + pub fn size(&self) -> u32 { + self.body.getxattr_in.size + } +} + +impl<'o> Reply<'o, Listxattr> { + //TODO: buffered(), gather() + + pub fn value_size(self, size: u32) -> Done<'o> { + assert_eq!(self.tail.size, 0); + + self.single(&proto::ListxattrOut { + getxattr_out: proto::GetxattrOut { + size, + padding: Default::default(), + }, + }) + } + + pub fn buffer_too_small(self) -> Done<'o> { + self.fail(Errno::ERANGE) + } +} + +impl<'o> Request<'o, Removexattr> { + pub fn name(&self) -> &OsStr { + c_to_os(self.body) + } +} + +impl<'o> Reply<'o, Removexattr> { + pub fn ok(self) -> Done<'o> { + self.empty() + } +} diff --git a/src/fuse/session.rs b/src/fuse/session.rs index 55fedcb..e83a8d4 100644 --- a/src/fuse/session.rs +++ b/src/fuse/session.rs @@ -180,7 +180,7 @@ impl Session { let reply = Reply { session: self, unique: header.unique, - tail: ops::state::Init { + tail: ops::InitState { kernel_flags: proto::InitFlags::from_bits_truncate(body.flags), buffer_pages: self.buffer_pages, }, |
