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 - Renamed signal.h to avoid collision in AcessNative
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Storage
/
LVM
/
mbr.c
diff --git
a/KernelLand/Modules/Storage/LVM/mbr.c
b/KernelLand/Modules/Storage/LVM/mbr.c
index
c137a8a
..
9de8fcd
100644
(file)
--- a/
KernelLand/Modules/Storage/LVM/mbr.c
+++ b/
KernelLand/Modules/Storage/LVM/mbr.c
@@
-73,10
+73,19
@@
int LVM_MBR_CountSubvolumes(tLVM_Vol *Volume, void *FirstSector)
numPartitions ++;
}
}
numPartitions ++;
}
}
+ // Detect the GPT protector
+ if( extendedLBA == 0 && numPartitions == 1 && MBR->Parts[0].SystemID == 0xEE )
+ {
+ // TODO: Hand off to GPT parsing code
+ Log_Warning("LBA MBR", "TODO: Hand off to GPT");
+ }
+
+ // Handle extended partions
while(extendedLBA != 0)
{
extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
while(extendedLBA != 0)
{
extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
- if( extendedLBA == -1 ) break;
+ if( extendedLBA == (Uint64)-1 )
+ break;
numPartitions ++;
}
LOG("numPartitions = %i", numPartitions);
numPartitions ++;
}
LOG("numPartitions = %i", numPartitions);
@@
-127,7
+136,8
@@
void LVM_MBR_PopulateSubvolumes(tLVM_Vol *Volume, void *FirstSector)
while(extendedLBA != 0)
{
extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
while(extendedLBA != 0)
{
extendedLBA = LVM_MBR_int_ReadExt(Volume, extendedLBA, &base, &len);
- if(extendedLBA == -1) break;
+ if(extendedLBA == (Uint64)-1)
+ break;
LVM_int_SetSubvolume_Anon( Volume, j, base, len );
j ++ ;
}
LVM_int_SetSubvolume_Anon( Volume, j, base, len );
j ++ ;
}
UCC
git Repository :: git.ucc.asn.au