X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FStorage%2FLVM%2Fmain.c;h=44c2e57924f489f861750eda4d4a23ec84f679cd;hb=25b02822ad95feb8f82f7b8fef44a58e29afb79b;hp=587689efd9bc6899cce743a8266faf816b535dd9;hpb=1d65dd9606edfcaeef8dfff3724ef6c49180b131;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Storage/LVM/main.c b/KernelLand/Modules/Storage/LVM/main.c
index 587689ef..44c2e579 100644
--- a/KernelLand/Modules/Storage/LVM/main.c
+++ b/KernelLand/Modules/Storage/LVM/main.c
@@ -5,7 +5,7 @@
  * lvm.h
  * - LVM Core definitions
  */
-#define DEBUG	0
+#define DEBUG	1
 #define VERSION	VER2(0,1)
 #include "lvm_int.h"
 #include <fs_devfs.h>
@@ -15,12 +15,14 @@
 // === PROTOTYPES ===
 // ---
  int	LVM_Initialise(char **Arguments);
-void	LVM_Cleanup(void);
+ int	LVM_Cleanup(void);
 // ---
 char	*LVM_Root_ReadDir(tVFS_Node *Node, int ID);
 tVFS_Node	*LVM_Root_FindDir(tVFS_Node *Node, const char *Name);
 char	*LVM_Vol_ReadDir(tVFS_Node *Node, int ID);
 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);
 
@@ -35,7 +37,9 @@ tVFS_NodeType	gLVM_RootNodeType = {
 };
 tVFS_NodeType	gLVM_VolNodeType = {
 	.ReadDir = LVM_Vol_ReadDir,
-	.FindDir = LVM_Vol_FindDir
+	.FindDir = LVM_Vol_FindDir,
+	.Read = LVM_Vol_Read,
+	.Write = LVM_Vol_Write
 };
 tVFS_NodeType	gLVM_SubVolNodeType = {
 	.Read = LVM_SubVol_Read,
@@ -43,7 +47,7 @@ tVFS_NodeType	gLVM_SubVolNodeType = {
 };
 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;
@@ -56,9 +60,58 @@ 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);
+			
+			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;
 }
 
 // --------------------------------------------------------------------
@@ -84,7 +137,7 @@ tVFS_Node *LVM_Root_FindDir(tVFS_Node *Node, const char *Name)
 	{
 		if( strcmp(vol->Name, Name) == 0 )
 		{
-			return &vol->Node;
+			return &vol->DirNode;
 		}
 	}
 	return NULL;
@@ -94,14 +147,20 @@ char *LVM_Vol_ReadDir(tVFS_Node *Node, int ID)
 {
 	tLVM_Vol	*vol = Node->ImplPtr;
 	
-	if( ID < 0 || ID >= vol->nSubVolumes )
+	if( ID < 0 || ID >= vol->nSubVolumes+1 )
 		return NULL;
-	
-	return strdup( vol->SubVolumes[ID]->Name );
+
+	if( ID == 0 )
+		return strdup(".volume");
+	else
+		return strdup( vol->SubVolumes[ID-1]->Name );
 }
 tVFS_Node *LVM_Vol_FindDir(tVFS_Node *Node, const char *Name)
 {
 	tLVM_Vol	*vol = Node->ImplPtr;
+
+	if( strcmp(".volume", Name) == 0 )
+		return &vol->VolNode;
 	
 	for( int i = 0; i < vol->nSubVolumes; i ++ )
 	{
@@ -114,6 +173,29 @@ tVFS_Node *LVM_Vol_FindDir(tVFS_Node *Node, const char *Name)
 	return NULL;
 }
 
+size_t LVM_Vol_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
+{
+	tLVM_Vol	*vol = Node->ImplPtr;
+	Uint64	byte_size = vol->BlockCount * vol->BlockSize;	
+
+	if( Offset > byte_size )
+		return 0;
+	if( Length > byte_size )
+		Length = byte_size;
+	if( Offset + Length > byte_size )
+		Length = byte_size - Offset;
+
+	return DrvUtil_ReadBlock(
+		Offset, Length, Buffer, 
+		LVM_int_DrvUtil_ReadBlock, vol->BlockSize, vol
+		);
+}
+
+size_t LVM_Vol_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer)
+{
+	return 0;
+}
+
 size_t LVM_SubVol_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 {
 	tLVM_SubVolume	*sv = Node->ImplPtr;
@@ -126,8 +208,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