i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfs: Move volume->ops NULL check to just after call to mount().

Browse Source 
As Rene pointed out on the mailing list, if this is NULL after the file system
mount call occurs, then something has gone very wrong and we should treat it
as an error.
This commit is contained in:
Augustin Cavalier
2018-07-10 17:46:59 -04:00
parent ffd36865cf
commit de6ea5f43f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+3 -3
View File
@@ -7497,7 +7497,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
status = mount->volume->file_system->mount(mount->volume, device, flags,
args, &rootID);
if (status != 0)
if (status != B_OK || mount->volume->ops == NULL)
goto err2;
} else {
status = path_to_vnode(path, true, &coveredNode, NULL, kernel);
@@ -7523,7 +7523,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
while (volume) {
status = volume->file_system->mount(volume, device, flags, args,
&rootID);
if (status != B_OK) {
if (status != B_OK || volume->ops == NULL) {
if (volume->sub_volume)
goto err4;
goto err3;
@@ -7534,7 +7534,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
volume = mount->volume;
while (volume) {
if (volume->ops != NULL && volume->ops->all_layers_mounted != NULL)
if (volume->ops->all_layers_mounted != NULL)
volume->ops->all_layers_mounted(volume);
volume = volume->super_volume;
}