ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vfs: do not return early on directory operations 

When returning early on directory operations, file systems that might
be able to handle the request but come after the current one are not
tried.

Fixes #1400.
This commit is contained in:
Josef Söntgen 2015-02-04 19:23:01 +01:00 committed by Christian Helmuth
parent c2c8483293
commit 4ca1284e0e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,16 @@ class Vfs::Dir_file_system : public File_system
*/
bool permission_denied = false;
/*
* Keep the most meaningful error code. When using stacked file
* systems, most child file systems will eventually return no
* entry (or leave the error code unchanged). If any of those
* file systems has anything more interesting to tell, return
* this information after all file systems have been tried and
* none could handle the request.
*/
RES error = ok;
/*
* The given path refers to at least one of our sub directories.
* Propagate the request into all of our file systems. If at least
@ -96,22 +106,16 @@ class Vfs::Dir_file_system : public File_system
if (err == ok)
return err;
/*
* Keep the most meaningful error code. When using stacked file
* systems, most child file systems will eventually return no
* entry (or leave the error code unchanged). If any of those
* file systems has anything more interesting to tell (in
* particular no perm), return this information.
*/
if (err != no_entry && err != no_perm)
return err;
if (err != no_entry && err != no_perm) {
error = err;
}
if (err == no_perm)
permission_denied = true;
}
/* none of our file systems could successfully operate on the path */
return permission_denied ? no_perm : no_entry;
return error != ok ? error : permission_denied ? no_perm : no_entry;
}
/**