Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 01:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove pointless error codes in unregister_observer

Browse Source
This commit is contained in:
Ruihan Li
2024-04-20 23:17:20 -07:00
committed by Tate, Hongliang Tian
parent 57f4ed778d
commit ab87f473c4
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/aster-nix/src/fs/epoll/epoll_file.rs
View File

@ -353,10 +353,8 @@ impl FileLike for EpollFile {
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.pollee self.pollee.unregister_observer(observer)
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "observer is not registered"))
} }
} }

5
kernel/aster-nix/src/fs/file_handle.rs
View File

@ -96,11 +96,12 @@ pub trait FileLike: Send + Sync + Any {
return_errno_with_message!(Errno::EINVAL, "register_observer is not supported") return_errno_with_message!(Errno::EINVAL, "register_observer is not supported")
} }
#[must_use]
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
return_errno_with_message!(Errno::EINVAL, "unregister_observer is not supported") None
} }
fn as_socket(self: Arc<Self>) -> Option<Arc<dyn Socket>> { fn as_socket(self: Arc<Self>) -> Option<Arc<dyn Socket>> {

4
kernel/aster-nix/src/fs/pipe.rs
View File

@ -71,7 +71,7 @@ impl FileLike for PipeReader {
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.consumer.unregister_observer(observer) self.consumer.unregister_observer(observer)
} }
} }
@ -137,7 +137,7 @@ impl FileLike for PipeWriter {
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.producer.unregister_observer(observer) self.producer.unregister_observer(observer)
} }
} }

7
kernel/aster-nix/src/fs/utils/channel.rs
View File

@ -98,11 +98,8 @@ macro_rules! impl_common_methods_for_channel {
pub fn unregister_observer( pub fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.this_end() self.this_end().pollee.unregister_observer(observer)
.pollee
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "the observer is not registered"))
} }
}; };
} }

6
kernel/aster-nix/src/net/socket/ip/datagram/mod.rs
View File

@ -224,10 +224,8 @@ impl FileLike for DatagramSocket {
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.pollee self.pollee.unregister_observer(observer)
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "observer is not registered"))
} }
} }

6
kernel/aster-nix/src/net/socket/ip/stream/mod.rs
View File

@ -366,10 +366,8 @@ impl FileLike for StreamSocket {
fn unregister_observer( fn unregister_observer(
&self, &self,
observer: &Weak<dyn Observer<IoEvents>>, observer: &Weak<dyn Observer<IoEvents>>,
) -> Result<Weak<dyn Observer<IoEvents>>> { ) -> Option<Weak<dyn Observer<IoEvents>>> {
self.pollee self.pollee.unregister_observer(observer)
.unregister_observer(observer)
.ok_or_else(|| Error::with_message(Errno::ENOENT, "observer is not registered"))
} }
} }