ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-12 20:28:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: pass root directory to plugins

Browse Source 
This patch enables the use of the VFS from VFS plugins by passing a
reference of the root directory to the constructors of file-system
instances. Since it changes the signature of 'Vfs::Dir_file_system',
any code that uses the VFS directly requires an adaptation.

Fixes #2701
This commit is contained in:
Norman Feske
2018-03-02 13:30:10 +01:00
committed by Christian Helmuth
parent f61c0c6309
commit b0b92e4ee2
26 changed files with 118 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
repos/os/include/vfs/dir_file_system.h
View File

@ -30,8 +30,6 @@ class Vfs::Dir_file_system : public File_system
enum { MAX_NAME_LEN = 128 };
struct Root { };
private:
/*
@ -45,7 +43,9 @@ class Vfs::Dir_file_system : public File_system
*
* Additionally, the root has an empty _name.
*/
bool _vfs_root;
bool _vfs_root = false;
Dir_file_system &_root_dir;
struct Dir_vfs_handle : Vfs_handle
{
@ -95,7 +95,7 @@ class Vfs::Dir_file_system : public File_system
};
/* pointer to first child file system */
File_system *_first_file_system;
File_system *_first_file_system = nullptr;
/* add new file system to the list of children */
void _append_file_system(File_system *fs)
@ -326,10 +326,10 @@ class Vfs::Dir_file_system : public File_system
Genode::Allocator &alloc,
Genode::Xml_node node,
Io_response_handler &io_handler,
File_system_factory &fs_factory)
File_system_factory &fs_factory,
Dir_file_system &root_dir)
:
_vfs_root(false),
_first_file_system(0)
_root_dir(root_dir)
{
using namespace Genode;
@ -346,11 +346,14 @@ class Vfs::Dir_file_system : public File_system
/* traverse into <dir> nodes */
if (sub_node.has_type("dir")) {
_append_file_system(new (alloc)
Dir_file_system(env, alloc, sub_node, io_handler, fs_factory));
Dir_file_system(env, alloc, sub_node, io_handler,
fs_factory, _root_dir));
continue;
}
File_system *fs = fs_factory.create(env, alloc, sub_node, io_handler);
File_system * const fs =
fs_factory.create(env, alloc, sub_node, io_handler, _root_dir);
if (fs) {
_append_file_system(fs);
continue;
@ -369,15 +372,19 @@ class Vfs::Dir_file_system : public File_system
}
}
/**
* Constructor used for creating the root directory
*/
Dir_file_system(Genode::Env &env,
Genode::Allocator &alloc,
Genode::Xml_node node,
Io_response_handler &io_handler,
File_system_factory &fs_factory,
Dir_file_system::Root)
File_system_factory &fs_factory)
:
Dir_file_system(env, alloc, node, io_handler, fs_factory)
{ _vfs_root = true; }
Dir_file_system(env, alloc, node, io_handler, fs_factory, *this)
{
_vfs_root = true;
}
/*********************************
** Directory-service interface **