@@ -29,13 +29,12 @@ macro_rules! module_log {
2929}
3030
3131#[ allow( unused_variables) ]
32- fn bind_mount ( reason : & str , src : & Utf8CStr , dest : & Utf8CStr , rec : bool ) -> OsResultStatic < ( ) > {
32+ fn bind_mount ( reason : & str , src : & Utf8CStr , dest : & Utf8CStr , rec : bool ) {
3333 module_log ! ( reason, dest, src) ;
3434 // Ignore any kind of error here. If a single bind mount fails due to selinux permissions or
3535 // kernel limitations, don't let it break module mount entirely.
3636 src. bind_mount_to ( dest, rec) . log_ok ( ) ;
3737 dest. remount_mount_point_flags ( MS_RDONLY ) . log_ok ( ) ;
38- Ok ( ( ) )
3938}
4039
4140fn mount_dummy ( reason : & str , src : & Utf8CStr , dest : & Utf8CStr , is_dir : bool ) -> OsResultStatic < ( ) > {
@@ -44,7 +43,8 @@ fn mount_dummy(reason: &str, src: &Utf8CStr, dest: &Utf8CStr, is_dir: bool) -> O
4443 } else {
4544 dest. create ( O_CREAT | O_RDONLY | O_CLOEXEC , 0o000 ) ?;
4645 }
47- bind_mount ( reason, src, dest, false )
46+ bind_mount ( reason, src, dest, false ) ;
47+ Ok ( ( ) )
4848}
4949
5050// File path that act like a stack, popping out the last element
@@ -248,7 +248,7 @@ impl FsNode {
248248 self . commit_tmpfs ( path. reborrow ( ) ) ?;
249249 // Transitioning from non-tmpfs to tmpfs, we need to actually mount the
250250 // worker dir to dest after all children are committed.
251- bind_mount ( "move" , path. worker ( ) , path. real ( ) , true ) ? ;
251+ bind_mount ( "move" , path. worker ( ) , path. real ( ) , true ) ;
252252 } else {
253253 for ( name, node) in children {
254254 let path = path. append ( name) ;
@@ -257,7 +257,7 @@ impl FsNode {
257257 }
258258 }
259259 FsNode :: File { src } => {
260- bind_mount ( "mount" , src, path. real ( ) , false ) ? ;
260+ bind_mount ( "mount" , src, path. real ( ) , false ) ;
261261 }
262262 _ => {
263263 error ! ( "Unable to handle '{}': parent should be tmpfs" , path. real( ) ) ;
@@ -292,7 +292,7 @@ impl FsNode {
292292 & src,
293293 path. real ( ) ,
294294 matches ! ( node, FsNode :: Directory { .. } ) ,
295- ) ? ;
295+ ) ;
296296 }
297297 _ => node. commit_tmpfs ( path) ?,
298298 }
0 commit comments