general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support to mount FS at any existing directories

Browse Source
This commit is contained in:
LI Qing 2020-11-30 17:23:21 +08:00 committed by Zongmin.Gu
parent ce174e1496
commit a53562adea
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libos/src/fs/rootfs.rs
View File

@ -96,10 +96,6 @@ fn mount_nonroot_fs_according_to(mount_config: &Vec<ConfigMount>, root: &MNode)
if !mc.target.is_absolute() { if !mc.target.is_absolute() {
return_errno!(EINVAL, "The target path must be absolute"); return_errno!(EINVAL, "The target path must be absolute");
} }
if mc.target.parent().unwrap() != Path::new("/") {
return_errno!(EINVAL, "The target mount point must be under /");
}
let target_dirname = mc.target.file_name().unwrap().to_str().unwrap();
use self::ConfigMountFsType::*; use self::ConfigMountFsType::*;
match mc.type_ { match mc.type_ {
@ -133,7 +129,7 @@ fn mount_nonroot_fs_according_to(mount_config: &Vec<ConfigMount>, root: &MNode)
&SgxUuidProvider, &SgxUuidProvider,
)? )?
}; };
mount_fs_at(sefs, &root, target_dirname)?; mount_fs_at(sefs, root, &mc.target)?;
} }
TYPE_HOSTFS => { TYPE_HOSTFS => {
if mc.source.is_none() { if mc.source.is_none() {
@ -142,11 +138,11 @@ fn mount_nonroot_fs_according_to(mount_config: &Vec<ConfigMount>, root: &MNode)
let source_path = mc.source.as_ref().unwrap(); let source_path = mc.source.as_ref().unwrap();
let hostfs = HostFS::new(source_path); let hostfs = HostFS::new(source_path);
mount_fs_at(hostfs, &root, target_dirname)?; mount_fs_at(hostfs, root, &mc.target)?;
} }
TYPE_RAMFS => { TYPE_RAMFS => {
let ramfs = RamFS::new(); let ramfs = RamFS::new();
mount_fs_at(ramfs, &root, target_dirname)?; mount_fs_at(ramfs, root, &mc.target)?;
} }
TYPE_UNIONFS => { TYPE_UNIONFS => {
return_errno!(EINVAL, "Cannot mount UnionFS at non-root path"); return_errno!(EINVAL, "Cannot mount UnionFS at non-root path");
@ -156,16 +152,20 @@ fn mount_nonroot_fs_according_to(mount_config: &Vec<ConfigMount>, root: &MNode)
Ok(()) Ok(())
} }
fn mount_fs_at(fs: Arc<dyn FileSystem>, parent_inode: &MNode, dirname: &str) -> Result<()> { fn mount_fs_at(fs: Arc<dyn FileSystem>, parent_inode: &MNode, abs_path: &Path) -> Result<()> {
let mount_dir = match parent_inode.find(false, dirname) { let mut mount_dir = parent_inode.find(false, ".")?;
Ok(existing_dir) => { // The first component of abs_path is the RootDir, skip it.
if existing_dir.metadata()?.type_ != FileType::Dir { for dirname in abs_path.iter().skip(1) {
return_errno!(EIO, "not a directory"); mount_dir = match mount_dir.find(false, dirname.to_str().unwrap()) {
Ok(existing_dir) => {
if existing_dir.metadata()?.type_ != FileType::Dir {
return_errno!(EIO, "not a directory");
}
existing_dir
} }
existing_dir Err(_) => return_errno!(ENOENT, "Mount point does not exist"),
} };
Err(_) => return_errno!(ENOENT, "Mount point does not exist"), }
};
mount_dir.mount(fs); mount_dir.mount(fs);
Ok(()) Ok(())
} }