github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-01 22:50:54 +00:00
Code Issues Projects Releases Wiki Activity

kata-sys-util: handle ENOSYS gracefully in mount destination creation

Browse Source 
When using virtio-fs with nydusd's passthrough_fs, mkdir operations may
return ENOSYS on certain filesystem configurations. This causes mount
destination creation to fail unexpectedly.

Handle ENOSYS errors gracefully alongside AlreadyExists by verifying the
directory exists after the failed mkdir attempt, allowing the mount to
proceed if the directory is already present.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
This commit is contained in:
Alex Lyn
2026-03-31 11:57:11 +08:00
committed by Fabiano Fidêncio
parent b50f803a4e
commit 8eb564dfb8
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/kata-sys-util/src/mount.rs
View File

@@ -190,10 +190,20 @@ pub fn create_mount_destination<S: AsRef<Path>, D: AsRef<Path>, R: AsRef<Path>>(
.parent()
.ok_or_else(|| Error::InvalidPath(dst.to_path_buf()))?;
let mut builder = fs::DirBuilder::new();
builder
.mode(MOUNT_DIR_PERM)
.recursive(true)
.create(parent)?;
builder.mode(MOUNT_DIR_PERM).recursive(true);
// Try to create parent directory, but handle ENOSYS gracefully
// ENOSYS can occur on certain filesystems (e.g., virtio-fs) where mkdir is not fully supported
if let Err(e) = builder.create(parent) {
// If the error is ENOSYS or AlreadyExists, check if parent exists and continue
if e.kind() != std::io::ErrorKind::AlreadyExists && e.raw_os_error() != Some(libc::ENOSYS) {
return Err(e.into());
}
// Verify parent exists
if !parent.exists() {
return Err(e.into());
}
}
if fs_type == "bind" {
// The source and destination for bind mounting must be the same type: file or directory.
@@ -207,11 +217,17 @@ pub fn create_mount_destination<S: AsRef<Path>, D: AsRef<Path>, R: AsRef<Path>>(
}
}
// Try to create destination directory, but handle ENOSYS gracefully
if let Err(e) = builder.create(dst) {
if e.kind() != std::io::ErrorKind::AlreadyExists {
if e.kind() != std::io::ErrorKind::AlreadyExists && e.raw_os_error() != Some(libc::ENOSYS) {
return Err(e.into());
}
// If ENOSYS or AlreadyExists, check if dst exists and is a directory
if !dst.exists() || !dst.is_dir() {
return Err(Error::InvalidPath(dst.to_path_buf()));
}
}
if !dst.is_dir() {
Err(Error::InvalidPath(dst.to_path_buf()))
} else {