X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FStorage%2FLVM%2Fmain.c;h=8793d68be3cd78eda6539f1307016ef710a129f2;hb=d69e48450c7ea4be4a82c351b2d5dd0de3fc6241;hp=39ce9a921c1787d85e2866383d58813b554d38bc;hpb=2188ee53c02fc249c3f6ee8a08758e940024d754;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Storage/LVM/main.c b/KernelLand/Modules/Storage/LVM/main.c
index 39ce9a92..8793d68b 100644
--- a/KernelLand/Modules/Storage/LVM/main.c
+++ b/KernelLand/Modules/Storage/LVM/main.c
@@ -15,16 +15,17 @@
 // === PROTOTYPES ===
 // ---
  int	LVM_Initialise(char **Arguments);
-void	LVM_Cleanup(void);
+ int	LVM_Cleanup(void);
 // ---
-char	*LVM_Root_ReadDir(tVFS_Node *Node, int ID);
+ int	LVM_Root_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX]);
 tVFS_Node	*LVM_Root_FindDir(tVFS_Node *Node, const char *Name);
-char	*LVM_Vol_ReadDir(tVFS_Node *Node, int ID);
+ int	LVM_Vol_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX]);
 tVFS_Node	*LVM_Vol_FindDir(tVFS_Node *Node, const char *Name);
 size_t	LVM_Vol_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);
 size_t	LVM_Vol_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer);
 size_t	LVM_SubVol_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);
 size_t	LVM_SubVol_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer);
+void	LVM_CloseNode(tVFS_Node *Node);
 
 Uint	LVM_int_DrvUtil_ReadBlock(Uint64 Address, Uint Count, void *Buffer, void *Argument);
 Uint	LVM_int_DrvUtil_WriteBlock(Uint64 Address, Uint Count, const void *Buffer, void *Argument);
@@ -39,15 +40,17 @@ tVFS_NodeType	gLVM_VolNodeType = {
 	.ReadDir = LVM_Vol_ReadDir,
 	.FindDir = LVM_Vol_FindDir,
 	.Read = LVM_Vol_Read,
-	.Write = LVM_Vol_Write
+	.Write = LVM_Vol_Write,
+	.Close = LVM_CloseNode
 };
 tVFS_NodeType	gLVM_SubVolNodeType = {
 	.Read = LVM_SubVol_Read,
-	.Write = LVM_SubVol_Write
+	.Write = LVM_SubVol_Write,
+	.Close = LVM_CloseNode
 };
 tDevFS_Driver	gLVM_DevFS = {
 	NULL, "LVM",
-	{.Flags = VFS_FFLAG_DIRECTORY, .Type = &gLVM_RootNodeType}
+	{.Flags = VFS_FFLAG_DIRECTORY, .Type = &gLVM_RootNodeType, .Size = -1}
 };
 
 tLVM_Vol	*gpLVM_FirstVolume;
@@ -60,26 +63,81 @@ int LVM_Initialise(char **Arguments)
 	return 0;
 }
 
-void LVM_Cleanup(void)
+int LVM_Cleanup(void)
 {
+	// Attempt to destroy all volumes
+	tLVM_Vol	*vol, *prev = NULL, *next;
 	
+	// TODO: Locks?
+	for( vol = gpLVM_FirstVolume; vol; prev = vol, vol = next )
+	{
+		next = vol->Next;
+		 int	nFree = 0;
+		
+		for( int i = 0; i < vol->nSubVolumes; i ++ )
+		{
+			tLVM_SubVolume	*sv;
+			sv = vol->SubVolumes[i];
+			if( sv == NULL ) {
+				nFree ++;
+				continue;
+			}
+
+			Mutex_Acquire(&sv->Node.Lock);
+			if(sv->Node.ReferenceCount == 0) {
+				nFree ++;
+				vol->SubVolumes[i] = NULL;
+				Mutex_Release(&sv->Node.Lock);
+			}
+			else {
+				Mutex_Release(&sv->Node.Lock);
+				continue ;
+			}
+
+			Mutex_Acquire(&sv->Node.Lock);
+			LOG("Removed subvolume %s:%s", vol->Name, sv->Name);
+			free(sv);
+		}
+		
+		if( nFree != vol->nSubVolumes )
+			continue ;
+
+		if(prev)
+			prev->Next = next;
+		else
+			gpLVM_FirstVolume = next;
+
+		Mutex_Acquire(&vol->DirNode.Lock);
+		Mutex_Acquire(&vol->VolNode.Lock);
+		if( vol->Type->Cleanup )
+			vol->Type->Cleanup( vol->Ptr );
+		LOG("Removed volume %s", vol->Name);
+		free(vol);
+	}
+
+	if( gpLVM_FirstVolume )	
+		return EBUSY;
+	
+	return EOK;
 }
 
 // --------------------------------------------------------------------
 // VFS Inteface
 // --------------------------------------------------------------------
-char *LVM_Root_ReadDir(tVFS_Node *Node, int ID)
+int LVM_Root_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX])
 {
 	tLVM_Vol	*vol;
 	
-	if( ID < 0 )	return NULL;	
+	if( ID < 0 )	return -EINVAL;
 
 	for( vol = gpLVM_FirstVolume; vol && ID --; vol = vol->Next );
 	
-	if(vol)
-		return strdup(vol->Name);
+	if(vol) {
+		strncpy(Dest, vol->Name, FILENAME_MAX);
+		return 0;
+	}
 	else
-		return NULL;
+		return -ENOENT;
 }
 tVFS_Node *LVM_Root_FindDir(tVFS_Node *Node, const char *Name)
 {
@@ -88,35 +146,42 @@ tVFS_Node *LVM_Root_FindDir(tVFS_Node *Node, const char *Name)
 	{
 		if( strcmp(vol->Name, Name) == 0 )
 		{
+			vol->DirNode.ReferenceCount ++;
 			return &vol->DirNode;
 		}
 	}
 	return NULL;
 }
 
-char *LVM_Vol_ReadDir(tVFS_Node *Node, int ID)
+int LVM_Vol_ReadDir(tVFS_Node *Node, int ID, char Dest[FILENAME_MAX])
 {
 	tLVM_Vol	*vol = Node->ImplPtr;
+	const char *src;
 	
 	if( ID < 0 || ID >= vol->nSubVolumes+1 )
-		return NULL;
+		return -EINVAL;
 
-	if( ID == 0 )
-		return strdup(".volume");
-	else
-		return strdup( vol->SubVolumes[ID-1]->Name );
+	if( ID == 0 ) {
+		src = "ROOT";
+	}
+	else {
+		src = vol->SubVolumes[ID-1]->Name;
+	}
+	strncpy(Dest, src, FILENAME_MAX);
+	return 0;
 }
 tVFS_Node *LVM_Vol_FindDir(tVFS_Node *Node, const char *Name)
 {
 	tLVM_Vol	*vol = Node->ImplPtr;
 
-	if( strcmp(".volume", Name) == 0 )
+	if( strcmp("ROOT", Name) == 0 )
 		return &vol->VolNode;
 	
 	for( int i = 0; i < vol->nSubVolumes; i ++ )
 	{
 		if( strcmp(vol->SubVolumes[i]->Name, Name) == 0 )
 		{
+			vol->SubVolumes[i]->Node.ReferenceCount ++;
 			return &vol->SubVolumes[i]->Node;
 		}
 	}
@@ -159,8 +224,13 @@ size_t LVM_SubVol_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffe
 	if( Offset + Length > byte_size )
 		Length = byte_size - Offset;
 
-	Offset += sv->FirstBlock * sv->Vol->BlockSize;	
+	LOG("Reading (0x%llx+0x%llx)+0x%x to %p",
+		(Uint64)(sv->FirstBlock * sv->Vol->BlockSize), Offset,
+		Length, Buffer
+		);
 	
+	Offset += sv->FirstBlock * sv->Vol->BlockSize;	
+
 	return DrvUtil_ReadBlock(
 		Offset, Length, Buffer, 
 		LVM_int_DrvUtil_ReadBlock, sv->Vol->BlockSize, sv->Vol
@@ -187,6 +257,11 @@ size_t LVM_SubVol_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void
 		);
 }
 
+void LVM_CloseNode(tVFS_Node *Node)
+{
+	Node->ReferenceCount --;
+}
+
 Uint LVM_int_DrvUtil_ReadBlock(Uint64 Address, Uint Count, void *Buffer, void *Argument)
 {
 	return LVM_int_ReadVolume( Argument, Address, Count, Buffer );