summaryrefslogtreecommitdiff
path: root/src/ops
diff options
context:
space:
mode:
Diffstat (limited to 'src/ops')
-rw-r--r--src/ops/dir.rs6
-rw-r--r--src/ops/entry.rs7
-rw-r--r--src/ops/inode.rs11
-rw-r--r--src/ops/mod.rs17
-rw-r--r--src/ops/open.rs4
-rw-r--r--src/ops/traits.rs12
6 files changed, 37 insertions, 20 deletions
diff --git a/src/ops/dir.rs b/src/ops/dir.rs
index 210c13a..4b075eb 100644
--- a/src/ops/dir.rs
+++ b/src/ops/dir.rs
@@ -6,9 +6,10 @@ use std::{
};
use crate::{
- io::{Entry, EntryType, Interruptible, Known, Stat},
+ io::{Entry, EntryType, Ino, Interruptible, Known, Stat, Ttl},
+ proto,
sealed::Sealed,
- Done, Operation, Reply, Request,
+ Done, Errno, Operation, Reply, Request,
};
use super::{
@@ -20,7 +21,6 @@ use super::{
FromRequest,
};
-use crate::{proto, Errno, Ino, Ttl};
use bytemuck::{bytes_of, Zeroable};
use bytes::BufMut;
use nix::sys::stat::SFlag;
diff --git a/src/ops/entry.rs b/src/ops/entry.rs
index af48914..ac90a4d 100644
--- a/src/ops/entry.rs
+++ b/src/ops/entry.rs
@@ -3,7 +3,12 @@ use super::{
traits::{ReplyKnown, ReplyOk, RequestMode, RequestName},
};
-use crate::{io::Mode, proto, sealed::Sealed, Ino, Operation, Request};
+use crate::{
+ io::{Ino, Mode},
+ proto,
+ sealed::Sealed,
+ Operation, Request,
+};
use std::ffi::{CStr, OsStr};
pub enum Mknod {}
diff --git a/src/ops/inode.rs b/src/ops/inode.rs
index 15e3854..c1aa98c 100644
--- a/src/ops/inode.rs
+++ b/src/ops/inode.rs
@@ -1,5 +1,10 @@
use super::traits::{ReplyOk, RequestHandle};
-use crate::{io::Stat, proto, sealed::Sealed, Done, Ino, Operation, Reply, Request};
+use crate::{
+ io::{Ino, Stat},
+ proto,
+ sealed::Sealed,
+ Done, Operation, Reply, Request,
+};
pub enum Forget {}
pub enum Getattr {}
@@ -95,8 +100,8 @@ impl<'o> ReplyStat<'o> for Getattr {
let attrs = attrs.finish(inode);
reply.single(&proto::AttrOut {
- attr_valid: ttl.seconds,
- attr_valid_nsec: ttl.nanoseconds,
+ attr_valid: ttl.seconds(),
+ attr_valid_nsec: ttl.nanoseconds(),
dummy: Default::default(),
attr: attrs,
})
diff --git a/src/ops/mod.rs b/src/ops/mod.rs
index d4ebd72..89c39c1 100644
--- a/src/ops/mod.rs
+++ b/src/ops/mod.rs
@@ -3,7 +3,14 @@ use std::{
os::unix::ffi::OsStrExt,
};
-use crate::{proto, sealed::Sealed, util::OutputChain, Done, Ino, Operation, Reply, Request, Ttl};
+use crate::{
+ io::{Ino, Ttl},
+ proto,
+ sealed::Sealed,
+ util::OutputChain,
+ Done, Operation, Reply, Request,
+};
+
use bytemuck::{bytes_of, Pod};
pub mod traits;
@@ -73,10 +80,10 @@ fn make_entry(
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,
+ entry_valid: entry_ttl.seconds(),
+ attr_valid: attr_ttl.seconds(),
+ entry_valid_nsec: entry_ttl.nanoseconds(),
+ attr_valid_nsec: attr_ttl.nanoseconds(),
attr: attrs,
}
}
diff --git a/src/ops/open.rs b/src/ops/open.rs
index 2d1599d..0d58da7 100644
--- a/src/ops/open.rs
+++ b/src/ops/open.rs
@@ -1,9 +1,9 @@
use crate::{
- io::{AccessFlags, Known, Mode, OpenFlags, Stat},
+ io::{AccessFlags, Known, Mode, OpenFlags, Stat, Ttl},
proto::{self, OpenOutFlags},
sealed::Sealed,
util::OutputChain,
- Done, Errno, Operation, Reply, Request, Ttl,
+ Done, Errno, Operation, Reply, Request,
};
use super::{
diff --git a/src/ops/traits.rs b/src/ops/traits.rs
index e445687..20f7378 100644
--- a/src/ops/traits.rs
+++ b/src/ops/traits.rs
@@ -1,8 +1,12 @@
use crate::{
- io::{Entry, FsInfo, Interruptible, Known, Mode, Stat},
- Done, Ino, Operation, Reply, Request, Ttl,
+ io::{Entry, FsInfo, Ino, Interruptible, Known, Mode, Stat, Ttl},
+ Done, Operation, Reply, Request,
};
+use super::make_entry;
+use bytes::BufMut;
+use std::{ffi::OsStr, os::unix::ffi::OsStrExt};
+
pub use super::{
dir::{ReplyEntries, ReplyFound},
entry::{RequestDevice, RequestLink, RequestTarget},
@@ -13,10 +17,6 @@ pub use super::{
xattr::ReplyXattrRead,
};
-use super::make_entry;
-use bytes::BufMut;
-use std::{ffi::OsStr, os::unix::ffi::OsStrExt};
-
pub trait RequestName<'o>: Operation<'o> {
fn name<'a>(request: &'a Request<'o, Self>) -> &'a OsStr;
}