X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fvfs%2Fmain.c;h=c6525f49e2f389c4902c74c1d0ee03895fc86acc;hb=61cfad415a64c52ca253460231046f47fcb7fb15;hp=c0c37e1d5feeb4200f931085bd9d9e76a3f02add;hpb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;p=tpg%2Facess2.git diff --git a/Kernel/vfs/main.c b/Kernel/vfs/main.c index c0c37e1d..c6525f49 100644 --- a/Kernel/vfs/main.c +++ b/Kernel/vfs/main.c @@ -52,13 +52,14 @@ int VFS_Init(void) giVFS_DriverFileID = SysFS_RegisterFile("VFS/Drivers", NULL, 0); if( VFS_Mount("root", "/", "rootfs", "") != 0 ) { - Panic("Unable to mount root (Where the **** is rootfs?)"); + Log_KernelPanic("VFS", "Unable to mount root (Where the **** is rootfs?)"); return -1; } VFS_MkDir("/Devices"); VFS_MkDir("/Mount"); VFS_Mount("dev", "/Devices", "devfs", ""); - + + Log_Debug("VFS", "Setting max files"); CFGINT(CFG_VFS_MAXFILES) = 32; return 0; } @@ -75,12 +76,12 @@ char *VFS_GetTruePath(const char *Path) tmp = VFS_GetAbsPath(Path); if(tmp == NULL) return NULL; //Log(" VFS_GetTruePath: tmp = '%s'", tmp); - node = VFS_ParsePath(tmp, &ret); + node = VFS_ParsePath(tmp, &ret, NULL); free(tmp); //Log(" VFS_GetTruePath: node=%p, ret='%s'", node, ret); if(!node) return NULL; - if(node->Close) node->Close(node); + if(node->Type->Close) node->Type->Close(node); return ret; }