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 Env and allocator when creating file-systems

Browse Source 
Fix #1891
This commit is contained in:
Emery Hemingway
2016-05-25 15:47:22 +02:00
committed by Christian Helmuth
parent beebd394fc
commit ddf3716cff
37 changed files with 436 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,10 @@ class Vfs::Dir_file_system : public File_system
public:
Dir_file_system(Xml_node node, File_system_factory &fs_factory)
Dir_file_system(Genode::Env &env,
Genode::Allocator &alloc,
Genode::Xml_node node,
File_system_factory &fs_factory)
:
_first_file_system(0)
{
@ -224,12 +227,12 @@ class Vfs::Dir_file_system : public File_system
/* traverse into <dir> nodes */
if (sub_node.has_type("dir")) {
_append_file_system(new (env()->heap())
Dir_file_system(sub_node, fs_factory));
_append_file_system(new (alloc)
Dir_file_system(env, alloc, sub_node, fs_factory));
continue;
}
File_system *fs = fs_factory.create(sub_node);
File_system *fs = fs_factory.create(env, alloc, sub_node);
if (fs) {
_append_file_system(fs);
continue;
@ -420,7 +423,7 @@ class Vfs::Dir_file_system : public File_system
Open_result open(char const *path,
unsigned mode,
Vfs_handle **out_handle,
Allocator &alloc = *Genode::env()->heap()) override
Allocator &alloc) override
{
/*
* If 'path' is a directory, we create a 'Vfs_handle'