File tree Expand file tree Collapse file tree 4 files changed +8
-9
lines changed Expand file tree Collapse file tree 4 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -549,17 +549,17 @@ impl INodeInterface for INode {
549
549
return Err ( FileSystemError :: NotSupported ) ;
550
550
}
551
551
552
- fn send ( & self , message_header : & mut MessageHeader ) -> super :: Result < usize > {
552
+ fn send ( & self , message_hdr : & mut MessageHeader ) -> super :: Result < usize > {
553
553
if let Some ( proxy) = self . proxy . as_ref ( ) {
554
- return proxy. send ( message_header ) ;
554
+ return proxy. send ( message_hdr ) ;
555
555
}
556
556
557
557
return Err ( FileSystemError :: NotSupported ) ;
558
558
}
559
559
560
- fn recv ( & self , message_header : & mut MessageHeader , non_block : bool ) -> super :: Result < usize > {
560
+ fn recv ( & self , message_hdr : & mut MessageHeader ) -> super :: Result < usize > {
561
561
if let Some ( proxy) = self . proxy . as_ref ( ) {
562
- return proxy. recv ( message_header , non_block ) ;
562
+ return proxy. recv ( message_hdr ) ;
563
563
}
564
564
565
565
return Err ( FileSystemError :: NotSupported ) ;
Original file line number Diff line number Diff line change @@ -248,7 +248,7 @@ pub trait INodeInterface: Send + Sync {
248
248
Err ( FileSystemError :: NotSupported )
249
249
}
250
250
251
- fn recv ( & self , _message_header : & mut MessageHeader , _non_block : bool ) -> Result < usize > {
251
+ fn recv ( & self , _message_hdr : & mut MessageHeader ) -> Result < usize > {
252
252
Err ( FileSystemError :: NotSocket )
253
253
}
254
254
Original file line number Diff line number Diff line change @@ -388,15 +388,15 @@ impl INodeInterface for UnixSocket {
388
388
Ok ( sock)
389
389
}
390
390
391
- fn recv ( & self , header : & mut MessageHeader , non_block : bool ) -> fs:: Result < usize > {
391
+ fn recv ( & self , header : & mut MessageHeader ) -> fs:: Result < usize > {
392
392
let inner = self . inner . lock_irq ( ) ;
393
393
394
394
let peer = match & inner. state {
395
395
UnixSocketState :: Connected ( peer) => peer,
396
396
_ => return Err ( FileSystemError :: NotConnected ) ,
397
397
} ;
398
398
399
- if self . buffer . lock_irq ( ) . is_empty ( ) && non_block {
399
+ if self . buffer . lock_irq ( ) . is_empty ( ) && self . is_non_block ( ) {
400
400
return Err ( FileSystemError :: WouldBlock ) ;
401
401
}
402
402
Original file line number Diff line number Diff line change @@ -97,8 +97,7 @@ pub fn sock_recv(
97
97
. get_handle ( sockfd)
98
98
. ok_or ( SyscallError :: EINVAL ) ?;
99
99
100
- let non_block = socket. flags . read ( ) . contains ( OpenFlags :: O_NONBLOCK ) ;
101
- Ok ( socket. inode ( ) . recv ( header, non_block) ?)
100
+ Ok ( socket. inode ( ) . recv ( header) ?)
102
101
}
103
102
104
103
/// Marks the socket as a passive socket (i.e. as a socket that will be used to accept incoming
You can’t perform that action at this time.
0 commit comments