X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fmount.c;h=0436043b1bd8c0f710557b1c73dd24a981eb2405;hb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;hp=090d0242860814d25afcd0080b8dcb61632a870b;hpb=bf7d1cd5635d41bd7c58bf99c61cdc670291c543;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/mount.c b/Kernel/vfs/mount.c
index 090d0242..0436043b 100644
--- a/Kernel/vfs/mount.c
+++ b/Kernel/vfs/mount.c
@@ -12,10 +12,10 @@ extern char	*gsVFS_MountFile;
 
 // === PROTOTYPES ===
  int	VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options);
-void	VFS_UpdateMountFile();
+void	VFS_UpdateMountFile(void);
 
 // === GLOBALS ===
- int	glVFS_MountList = 0;
+tMutex	glVFS_MountList;
 tVFS_Mount	*gVFS_Mounts;
 tVFS_Mount	*gVFS_RootMount = NULL;
 
@@ -43,7 +43,7 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 	// Get the filesystem
 	fs = VFS_GetFSByName(Filesystem);
 	if(!fs) {
-		Warning("VFS_Mount - Unknown FS Type '%s'", Filesystem);
+		Log_Warning("VFS", "VFS_Mount - Unknown FS Type '%s'", Filesystem);
 		return -1;
 	}
 	
@@ -82,7 +82,7 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 	if(!gVFS_RootMount)	gVFS_RootMount = mnt;
 	
 	// Add to mount list
-	LOCK( &glVFS_MountList );
+	Mutex_Acquire( &glVFS_MountList );
 	{
 		tVFS_Mount	*tmp;
 		mnt->Next = NULL;
@@ -94,9 +94,9 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
 			gVFS_Mounts = mnt;
 		}
 	}
-	RELEASE( &glVFS_MountList );
+	Mutex_Release( &glVFS_MountList );
 	
-	Log("VFS_Mount: Mounted '%s' to '%s' ('%s')", Device, MountPoint, Filesystem);
+	Log_Log("VFS", "Mounted '%s' to '%s' ('%s')", Device, MountPoint, Filesystem);
 	
 	VFS_UpdateMountFile();
 	
@@ -108,7 +108,7 @@ int VFS_Mount(char *Device, char *MountPoint, char *Filesystem, char *Options)
  * 
  * Updates the ProcFS mounts file buffer to match the current mounts list.
  */
-void VFS_UpdateMountFile()
+void VFS_UpdateMountFile(void)
 {
 	 int	len = 0;
 	char	*buf;