github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: use Path.is_file to check regular files

Browse Source 
Use Path.is_file to replace using `stat` to check the file type.

Fixes: #5185

Signed-off-by: Bin Liu <bin@hyper.sh>
This commit is contained in:
Bin Liu 2022-09-19 15:57:07 +08:00
parent 32a9d6d66d
commit 9670a3caac
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/runtime-rs/crates/resource/src/volume/share_fs_volume.rs
View File

@ -7,7 +7,6 @@
use std::{path::Path, sync::Arc};
use anyhow::{anyhow, Context, Result};
use nix::sys::stat::{stat, SFlag};
use super::Volume;
use crate::share_fs::{ShareFs, ShareFsVolumeConfig};
@ -34,44 +33,24 @@ impl ShareFsVolume {
let mut volume = Self { mounts: vec![] };
match share_fs {
None => {
let mut need_copy = false;
match stat(Path::new(&m.source)) {
Ok(stat) => {
// Ignore the mount if this is not a regular file (excludes
// directory, socket, device, ...) as it cannot be handled by
// a simple copy. But this should not be treated as an error,
// only as a limitation.
// golang implement:
// ModeType = ModeDir | ModeSymlink | ModeNamedPipe | ModeSocket |
// ModeDevice | ModeCharDevice | ModeIrregular
let file_type = SFlag::S_IFDIR
| SFlag::S_IFLNK
| SFlag::S_IFIFO
| SFlag::S_IFSOCK
| SFlag::S_IFCHR
| SFlag::S_IFREG;
if !file_type.contains(SFlag::from_bits_truncate(stat.st_mode)) {
debug!(
sl!(),
"Ignoring non-regular file as FS sharing not supported. mount: {:?}",
m
);
return Ok(volume);
}
if SFlag::from_bits_truncate(stat.st_mode) != SFlag::S_IFDIR {
need_copy = true;
}
}
let src = match std::fs::canonicalize(&m.source) {
Err(err) => {
return Err(anyhow!(format!(
"failed to stat file {} {:?}",
"failed to canonicalize file {} {:?}",
&m.source, err
)));
)))
}
Ok(src) => src,
};
if need_copy {
if src.is_file() {
// TODO: copy file
debug!(sl!(), "FIXME: copy file {}", &m.source);
} else {
debug!(
sl!(),
"Ignoring non-regular file as FS sharing not supported. mount: {:?}", m
);
}
}
Some(share_fs) => {