git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Added 'Flags' param to VFS Read/Write/FindDir
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Storage
/
LVM
/
volumes.c
diff --git
a/KernelLand/Modules/Storage/LVM/volumes.c
b/KernelLand/Modules/Storage/LVM/volumes.c
index
bd0b530
..
cf1a60d
100644
(file)
--- a/
KernelLand/Modules/Storage/LVM/volumes.c
+++ b/
KernelLand/Modules/Storage/LVM/volumes.c
@@
-5,6
+5,7
@@
* volumes.c
* - Volume management
*/
* volumes.c
* - Volume management
*/
+#define DEBUG 1
#include "lvm_int.h"
// === PROTOTYPES ===
#include "lvm_int.h"
// === PROTOTYPES ===
@@
-18,41
+19,54
@@
int LVM_AddVolumeVFS(const char *Name, int FD)
{
// Assuming 512-byte blocks, not a good idea
int LVM_AddVolumeVFS(const char *Name, int FD)
{
// Assuming 512-byte blocks, not a good idea
- return LVM_AddVolume(Name, (void*)(Uint)FD, 512, LVM_int_VFSReadEmul, LVM_int_VFSWriteEmul);
+// return LVM_AddVolume(Name, (void*)(Uint)FD, 512, LVM_int_VFSReadEmul, LVM_int_VFSWriteEmul);
+ return 0;
}
}
-int LVM_AddVolume(const
char *Name, void *Ptr, size_t BlockSize, tLVM_ReadFcn Read, tLVM_WriteFcn Write
)
+int LVM_AddVolume(const
tLVM_VolType *Type, const char *Name, void *Ptr, size_t BlockSize, size_t BlockCount
)
{
tLVM_Vol dummy_vol;
tLVM_Vol *real_vol;
{
tLVM_Vol dummy_vol;
tLVM_Vol *real_vol;
- tLVM_Format *
type
;
+ tLVM_Format *
fmt
;
void *first_block;
void *first_block;
+ if( BlockCount == 0 || BlockSize == 0 ) {
+ Log_Error("LVM", "BlockSize(0x%x)/BlockCount(0x%x) invalid in LVM_AddVolume",
+ BlockSize, BlockCount);
+ return 1;
+ }
+
+ dummy_vol.Type = Type;
dummy_vol.Ptr = Ptr;
dummy_vol.Ptr = Ptr;
- dummy_vol.Read = Read;
- dummy_vol.Write = Write;
+ dummy_vol.BlockCount = BlockCount;
dummy_vol.BlockSize = BlockSize;
// Read the first block of the volume
first_block = malloc(BlockSize);
dummy_vol.BlockSize = BlockSize;
// Read the first block of the volume
first_block = malloc(BlockSize);
- Read(Ptr, 0, 1, first_block);
+ if( !first_block ) {
+ Log_Error("VLM", "LVM_AddVolume - malloc error on %i bytes", BlockSize);
+ return -1;
+ }
+ Type->Read(Ptr, 0, 1, first_block);
- // Determine
Type
- // TODO: Determine
type
-
type
= &gLVM_MBRType;
+ // Determine
Format
+ // TODO: Determine
format
+
fmt
= &gLVM_MBRType;
// Type->CountSubvolumes
// Type->CountSubvolumes
- dummy_vol.nSubVolumes =
type
->CountSubvolumes(&dummy_vol, first_block);
+ dummy_vol.nSubVolumes =
fmt
->CountSubvolumes(&dummy_vol, first_block);
// Create real volume descriptor
// TODO: If this needs to be rescanned later, having the subvolume list separate might be an idea
real_vol = malloc( sizeof(tLVM_Vol) + strlen(Name) + 1 + sizeof(tLVM_SubVolume*) * dummy_vol.nSubVolumes );
// Create real volume descriptor
// TODO: If this needs to be rescanned later, having the subvolume list separate might be an idea
real_vol = malloc( sizeof(tLVM_Vol) + strlen(Name) + 1 + sizeof(tLVM_SubVolume*) * dummy_vol.nSubVolumes );
+ real_vol->Next = NULL;
+ real_vol->Type = Type;
real_vol->Ptr = Ptr;
real_vol->Ptr = Ptr;
- real_vol->Read = Read;
- real_vol->Write = Write;
real_vol->BlockSize = BlockSize;
real_vol->BlockSize = BlockSize;
+ real_vol->BlockCount = BlockCount;
real_vol->nSubVolumes = dummy_vol.nSubVolumes;
real_vol->SubVolumes = (void*)( real_vol->Name + strlen(Name) + 1 );
real_vol->nSubVolumes = dummy_vol.nSubVolumes;
real_vol->SubVolumes = (void*)( real_vol->Name + strlen(Name) + 1 );
+ real_vol->BlockSize = BlockSize;
strcpy(real_vol->Name, Name);
memset(real_vol->SubVolumes, 0, sizeof(tLVM_SubVolume*) * real_vol->nSubVolumes);
// - VFS Nodes
strcpy(real_vol->Name, Name);
memset(real_vol->SubVolumes, 0, sizeof(tLVM_SubVolume*) * real_vol->nSubVolumes);
// - VFS Nodes
@@
-60,13
+74,14
@@
int LVM_AddVolume(const char *Name, void *Ptr, size_t BlockSize, tLVM_ReadFcn Re
real_vol->DirNode.Type = &gLVM_VolNodeType;
real_vol->DirNode.ImplPtr = real_vol;
real_vol->DirNode.Flags = VFS_FFLAG_DIRECTORY;
real_vol->DirNode.Type = &gLVM_VolNodeType;
real_vol->DirNode.ImplPtr = real_vol;
real_vol->DirNode.Flags = VFS_FFLAG_DIRECTORY;
+ real_vol->DirNode.Size = -1;
memset(&real_vol->VolNode, 0, sizeof(tVFS_Node));
real_vol->VolNode.Type = &gLVM_VolNodeType;
real_vol->VolNode.ImplPtr = real_vol;
memset(&real_vol->VolNode, 0, sizeof(tVFS_Node));
real_vol->VolNode.Type = &gLVM_VolNodeType;
real_vol->VolNode.ImplPtr = real_vol;
- real_vol->VolNode.
Flags = VFS_FFLAG_DIRECTORY
;
+ real_vol->VolNode.
Size = BlockCount * BlockSize
;
// Type->PopulateSubvolumes
// Type->PopulateSubvolumes
-
type
->PopulateSubvolumes(real_vol, first_block);
+
fmt
->PopulateSubvolumes(real_vol, first_block);
free(first_block);
// Add to volume list
free(first_block);
// Add to volume list
@@
-109,6
+124,10
@@
void LVM_int_SetSubvolume_Anon(tLVM_Vol *Volume, int Index, Uint64 FirstBlock, U
sv->Node.ImplPtr = sv;
sv->Node.Type = &gLVM_SubVolNodeType;
sv->Node.ImplPtr = sv;
sv->Node.Type = &gLVM_SubVolNodeType;
+ sv->Node.Size = BlockCount * Volume->BlockSize;
+
+ Log_Log("LVM", "Partition %s/%s - 0x%llx+0x%llx blocks",
+ Volume->Name, sv->Name, FirstBlock, BlockCount);
}
// --------------------------------------------------------------------
}
// --------------------------------------------------------------------
@@
-116,12
+135,12
@@
void LVM_int_SetSubvolume_Anon(tLVM_Vol *Volume, int Index, Uint64 FirstBlock, U
// --------------------------------------------------------------------
size_t LVM_int_ReadVolume(tLVM_Vol *Volume, Uint64 BlockNum, size_t BlockCount, void *Dest)
{
// --------------------------------------------------------------------
size_t LVM_int_ReadVolume(tLVM_Vol *Volume, Uint64 BlockNum, size_t BlockCount, void *Dest)
{
- return Volume->Read(Volume->Ptr, BlockNum, BlockCount, Dest);
+ return Volume->
Type->
Read(Volume->Ptr, BlockNum, BlockCount, Dest);
}
size_t LVM_int_WriteVolume(tLVM_Vol *Volume, Uint64 BlockNum, size_t BlockCount, const void *Src)
{
}
size_t LVM_int_WriteVolume(tLVM_Vol *Volume, Uint64 BlockNum, size_t BlockCount, const void *Src)
{
- return Volume->
Write(Volume->Ptr, BlockNum, BlockCount, Src);
+ return Volume->
Type->Write(Volume->Ptr, BlockNum, BlockCount, Src);
}
int LVM_int_VFSReadEmul(void *Arg, Uint64 BlockStart, size_t BlockCount, void *Dest)
}
int LVM_int_VFSReadEmul(void *Arg, Uint64 BlockStart, size_t BlockCount, void *Dest)
UCC
git Repository :: git.ucc.asn.au