Use the default poll implementation of INode

This commit is contained in:
LI Qing 2023-04-17 14:06:19 +08:00 committed by volcano
parent 3e1ffd2b24
commit 634e9c3d68
10 changed files with 1 additions and 63 deletions

2
deps/sefs vendored

@ -1 +1 @@
Subproject commit a771d5d37f2a21b02ee579bab85dc8e551d924e0 Subproject commit a87fbb19e621d78413e2ee2af38d97b086e329b4

@ -15,14 +15,6 @@ impl INode for DevFd {
Err(vfs::FsError::PermError) Err(vfs::FsError::PermError)
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Ok(vfs::PollStatus {
read: true,
write: true,
error: false,
})
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 1, dev: 1,

@ -12,14 +12,6 @@ impl INode for DevNull {
Ok(buf.len()) Ok(buf.len())
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Ok(vfs::PollStatus {
read: true,
write: true,
error: false,
})
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 1, dev: 1,

@ -24,10 +24,6 @@ impl INode for DevSgx {
Err(FsError::PermError) Err(FsError::PermError)
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Err(FsError::PermError)
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 1, dev: 1,

@ -12,10 +12,6 @@ impl INode for DevShm {
Err(vfs::FsError::NotFile) Err(vfs::FsError::NotFile)
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Err(vfs::FsError::NotFile)
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 0, dev: 0,

@ -15,14 +15,6 @@ impl INode for DevZero {
Ok(buf.len()) Ok(buf.len())
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Ok(vfs::PollStatus {
read: true,
write: true,
error: false,
})
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 1, dev: 1,

@ -98,20 +98,6 @@ impl INode for HNode {
Ok(len) Ok(len)
} }
fn poll(&self) -> Result<PollStatus> {
if !self.is_file() {
return Err(FsError::NotFile);
}
let guard = self.open_file()?;
let file = guard.as_ref().unwrap();
let metadata = try_std!(file.metadata());
Ok(PollStatus {
read: true,
write: !metadata.permissions().readonly(),
error: false,
})
}
fn metadata(&self) -> Result<Metadata> { fn metadata(&self) -> Result<Metadata> {
let metadata = if self.is_file() { let metadata = if self.is_file() {
let guard = self.open_file()?; let guard = self.open_file()?;

@ -26,10 +26,6 @@ where
Err(vfs::FsError::NotFile) Err(vfs::FsError::NotFile)
} }
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Err(vfs::FsError::NotFile)
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 0, dev: 0,

@ -18,14 +18,6 @@ impl<T> INode for File<T>
where where
T: ProcINode + Sync + Send + 'static, T: ProcINode + Sync + Send + 'static,
{ {
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Ok(vfs::PollStatus {
read: true,
write: false,
error: false,
})
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 0, dev: 0,

@ -18,10 +18,6 @@ impl<T> INode for SymLink<T>
where where
T: ProcINode + Sync + Send + 'static, T: ProcINode + Sync + Send + 'static,
{ {
fn poll(&self) -> vfs::Result<vfs::PollStatus> {
Err(vfs::FsError::NotFile)
}
fn metadata(&self) -> vfs::Result<Metadata> { fn metadata(&self) -> vfs::Result<Metadata> {
Ok(Metadata { Ok(Metadata {
dev: 0, dev: 0,