diff --git a/deps/sefs b/deps/sefs index a771d5d3..a87fbb19 160000 --- a/deps/sefs +++ b/deps/sefs @@ -1 +1 @@ -Subproject commit a771d5d37f2a21b02ee579bab85dc8e551d924e0 +Subproject commit a87fbb19e621d78413e2ee2af38d97b086e329b4 diff --git a/src/libos/src/fs/dev_fs/dev_fd.rs b/src/libos/src/fs/dev_fs/dev_fd.rs index 65a5d28b..963037fd 100644 --- a/src/libos/src/fs/dev_fs/dev_fd.rs +++ b/src/libos/src/fs/dev_fs/dev_fd.rs @@ -15,14 +15,6 @@ impl INode for DevFd { Err(vfs::FsError::PermError) } - fn poll(&self) -> vfs::Result { - Ok(vfs::PollStatus { - read: true, - write: true, - error: false, - }) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 1, diff --git a/src/libos/src/fs/dev_fs/dev_null.rs b/src/libos/src/fs/dev_fs/dev_null.rs index aa81c72e..25a77303 100644 --- a/src/libos/src/fs/dev_fs/dev_null.rs +++ b/src/libos/src/fs/dev_fs/dev_null.rs @@ -12,14 +12,6 @@ impl INode for DevNull { Ok(buf.len()) } - fn poll(&self) -> vfs::Result { - Ok(vfs::PollStatus { - read: true, - write: true, - error: false, - }) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 1, diff --git a/src/libos/src/fs/dev_fs/dev_sgx/mod.rs b/src/libos/src/fs/dev_fs/dev_sgx/mod.rs index b1153f70..8aa99c6e 100644 --- a/src/libos/src/fs/dev_fs/dev_sgx/mod.rs +++ b/src/libos/src/fs/dev_fs/dev_sgx/mod.rs @@ -24,10 +24,6 @@ impl INode for DevSgx { Err(FsError::PermError) } - fn poll(&self) -> vfs::Result { - Err(FsError::PermError) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 1, diff --git a/src/libos/src/fs/dev_fs/dev_shm.rs b/src/libos/src/fs/dev_fs/dev_shm.rs index 8cfcd871..d32eec27 100644 --- a/src/libos/src/fs/dev_fs/dev_shm.rs +++ b/src/libos/src/fs/dev_fs/dev_shm.rs @@ -12,10 +12,6 @@ impl INode for DevShm { Err(vfs::FsError::NotFile) } - fn poll(&self) -> vfs::Result { - Err(vfs::FsError::NotFile) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 0, diff --git a/src/libos/src/fs/dev_fs/dev_zero.rs b/src/libos/src/fs/dev_fs/dev_zero.rs index 5f77c8f8..53605285 100644 --- a/src/libos/src/fs/dev_fs/dev_zero.rs +++ b/src/libos/src/fs/dev_fs/dev_zero.rs @@ -15,14 +15,6 @@ impl INode for DevZero { Ok(buf.len()) } - fn poll(&self) -> vfs::Result { - Ok(vfs::PollStatus { - read: true, - write: true, - error: false, - }) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 1, diff --git a/src/libos/src/fs/hostfs.rs b/src/libos/src/fs/hostfs.rs index 2da7c6ca..9da7ed97 100644 --- a/src/libos/src/fs/hostfs.rs +++ b/src/libos/src/fs/hostfs.rs @@ -98,20 +98,6 @@ impl INode for HNode { Ok(len) } - fn poll(&self) -> Result { - 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 { let metadata = if self.is_file() { let guard = self.open_file()?; diff --git a/src/libos/src/fs/procfs/proc_inode/dir.rs b/src/libos/src/fs/procfs/proc_inode/dir.rs index 5b504e65..15913974 100644 --- a/src/libos/src/fs/procfs/proc_inode/dir.rs +++ b/src/libos/src/fs/procfs/proc_inode/dir.rs @@ -26,10 +26,6 @@ where Err(vfs::FsError::NotFile) } - fn poll(&self) -> vfs::Result { - Err(vfs::FsError::NotFile) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 0, diff --git a/src/libos/src/fs/procfs/proc_inode/file.rs b/src/libos/src/fs/procfs/proc_inode/file.rs index e2fab56c..dafffbf3 100644 --- a/src/libos/src/fs/procfs/proc_inode/file.rs +++ b/src/libos/src/fs/procfs/proc_inode/file.rs @@ -18,14 +18,6 @@ impl INode for File where T: ProcINode + Sync + Send + 'static, { - fn poll(&self) -> vfs::Result { - Ok(vfs::PollStatus { - read: true, - write: false, - error: false, - }) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 0, diff --git a/src/libos/src/fs/procfs/proc_inode/symlink.rs b/src/libos/src/fs/procfs/proc_inode/symlink.rs index 7df91671..c252f87f 100644 --- a/src/libos/src/fs/procfs/proc_inode/symlink.rs +++ b/src/libos/src/fs/procfs/proc_inode/symlink.rs @@ -18,10 +18,6 @@ impl INode for SymLink where T: ProcINode + Sync + Send + 'static, { - fn poll(&self) -> vfs::Result { - Err(vfs::FsError::NotFile) - } - fn metadata(&self) -> vfs::Result { Ok(Metadata { dev: 0,