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

diff --git a/KernelLand/Modules/Storage/LVM/main.c b/KernelLand/Modules/Storage/LVM/main.c
index b3b9c6ca..8793d68b 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	1
+#define DEBUG	0
 #define VERSION	VER2(0,1)
 #include "lvm_int.h"
 #include <fs_devfs.h>
@@ -17,14 +17,15 @@
  int	LVM_Initialise(char **Arguments);
  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,11 +40,13 @@ 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",
@@ -84,9 +87,13 @@ int LVM_Cleanup(void)
 			if(sv->Node.ReferenceCount == 0) {
 				nFree ++;
 				vol->SubVolumes[i] = NULL;
+				Mutex_Release(&sv->Node.Lock);
 			}
-			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);
@@ -117,18 +124,20 @@ int LVM_Cleanup(void)
 // --------------------------------------------------------------------
 // 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)
 {
@@ -137,23 +146,29 @@ 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("ROOT");
-	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)
 {
@@ -166,6 +181,7 @@ tVFS_Node *LVM_Vol_FindDir(tVFS_Node *Node, const char *Name)
 	{
 		if( strcmp(vol->SubVolumes[i]->Name, Name) == 0 )
 		{
+			vol->SubVolumes[i]->Node.ReferenceCount ++;
 			return &vol->SubVolumes[i]->Node;
 		}
 	}
@@ -241,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 );