File tree Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -107,7 +107,7 @@ impl PseudoFs {
107
107
let mut inode = & self . root_inode ;
108
108
109
109
' outer: for component in path. components ( ) {
110
- debug ! ( "pseudo fs mount iterate {:?}" , component. as_os_str( ) ) ;
110
+ trace ! ( "pseudo fs mount iterate {:?}" , component. as_os_str( ) ) ;
111
111
match component {
112
112
Component :: RootDir => continue ,
113
113
Component :: CurDir => continue ,
Original file line number Diff line number Diff line change @@ -232,21 +232,15 @@ impl FuseChannel {
232
232
let mut fusereq_available = false ;
233
233
match self . poll . poll ( & mut events, None ) {
234
234
Ok ( _) => { }
235
- Err ( ref e) if e. kind ( ) == std:: io:: ErrorKind :: Interrupted => {
236
- continue ;
237
- }
235
+ Err ( ref e) if e. kind ( ) == std:: io:: ErrorKind :: Interrupted => continue ,
238
236
Err ( e) => return Err ( SessionFailure ( format ! ( "epoll wait: {}" , e) ) ) ,
239
237
}
240
238
241
239
for event in events. iter ( ) {
242
240
if event. is_readable ( ) {
243
241
match event. token ( ) {
244
- EXIT_FUSE_EVENT => {
245
- need_exit = true ;
246
- }
247
- FUSE_DEV_EVENT => {
248
- fusereq_available = true ;
249
- }
242
+ EXIT_FUSE_EVENT => need_exit = true ,
243
+ FUSE_DEV_EVENT => fusereq_available = true ,
250
244
x => {
251
245
error ! ( "unexpected epoll event" ) ;
252
246
return Err ( SessionFailure ( format ! ( "unexpected epoll event: {}" , x. 0 ) ) ) ;
@@ -288,9 +282,12 @@ impl FuseChannel {
288
282
}
289
283
Err ( e) => match e {
290
284
Errno :: ENOENT => {
291
- // ENOENT means the operation was interrupted, it's safe
292
- // to restart
293
- trace ! ( "restart reading" ) ;
285
+ // ENOENT means the operation was interrupted, it's safe to restart
286
+ trace ! ( "restart reading due to ENOENT" ) ;
287
+ continue ;
288
+ }
289
+ Errno :: EAGAIN => {
290
+ trace ! ( "restart reading due to EAGAIN" ) ;
294
291
continue ;
295
292
}
296
293
Errno :: EINTR => {
You can’t perform that action at this time.
0 commit comments