i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added the partition size as parameter to the file and partitioning

Browse Source 
system initialize() hooks. It's often the only info about the
  partition one needs and thus locking the partition just to get it is
  no longer necessary.
* intel partitioning system:
  - Removed passing around block sizes. We require 512 byte sectors
    anyway. In fact using the parent partition's block size was even
    wrong.
  - Simplified writing the partition map sector.
  - Simplified and corrected the partition map initialization.
  - We don't fail identifying a partition anymore, if the partition map
    contains no partitions. We would never identify a freshly
    initialized partition map before.
  - Made pm_identify() more intelligent: It determines the priority to
    return depending on whether the partition is the device itself and
    whether we have recognized child partitions.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22447 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-10-04 23:48:18 +00:00
parent 6748659272
commit db5c68ca46
17 changed files with 245 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
+22 -25
View File
@@ -298,25 +298,25 @@ Partition::Partition()
// constructor
Partition::Partition(const partition_descriptor *descriptor,off_t ptsOffset,
off_t baseOffset, int32 blockSize)
off_t baseOffset)
: fPTSOffset(0),
fOffset(0),
fSize(0),
fType(0),
fActive(false)
{
SetTo(descriptor, ptsOffset, baseOffset, blockSize);
SetTo(descriptor, ptsOffset, baseOffset);
}
// SetTo
void
Partition::SetTo(const partition_descriptor *descriptor, off_t ptsOffset,
off_t baseOffset, int32 blockSize)
off_t baseOffset)
{
TRACE(("Partition::SetTo(): active: %x\n", descriptor->active));
fPTSOffset = ptsOffset;
fOffset = baseOffset + (off_t)descriptor->start * blockSize;
fSize = (off_t)descriptor->size * blockSize;
fOffset = baseOffset + (off_t)descriptor->start * SECTOR_SIZE;
fSize = (off_t)descriptor->size * SECTOR_SIZE;
fType = descriptor->type;
fActive = descriptor->active;
if (fSize == 0)
@@ -337,10 +337,10 @@ Partition::Unset()
// GetPartitionDescriptor
void
Partition::GetPartitionDescriptor(partition_descriptor *descriptor,
off_t baseOffset, int32 blockSize) const
off_t baseOffset) const
{
descriptor->start = (fOffset - baseOffset) / blockSize;
descriptor->size = fSize / blockSize;
descriptor->start = (fOffset - baseOffset) / SECTOR_SIZE;
descriptor->size = fSize / SECTOR_SIZE;
descriptor->type = fType;
descriptor->active = fActive ? 0x80 : 0x00;
descriptor->begin.Unset();
@@ -362,13 +362,13 @@ Partition::AdjustSize(off_t sessionSize)
bool
Partition::CheckLocation(off_t sessionSize, int32 blockSize) const
Partition::CheckLocation(off_t sessionSize) const
{
// offsets and size must be block aligned, PTS and partition must lie
// within the session
return fPTSOffset % blockSize == 0
&& fOffset % blockSize == 0
&& fSize % blockSize == 0
return fPTSOffset % SECTOR_SIZE == 0
&& fOffset % SECTOR_SIZE == 0
&& fSize % SECTOR_SIZE == 0
&& fPTSOffset >= 0 && fPTSOffset < sessionSize
&& fOffset >= 0 && fOffset + fSize <= sessionSize;
}
@@ -388,22 +388,21 @@ PrimaryPartition::PrimaryPartition()
// constructor
PrimaryPartition::PrimaryPartition(const partition_descriptor *descriptor,
off_t ptsOffset, int32 blockSize)
off_t ptsOffset)
: Partition(),
fHead(NULL),
fTail(NULL),
fLogicalPartitionCount(0)
{
SetTo(descriptor, ptsOffset, blockSize);
SetTo(descriptor, ptsOffset);
}
// SetTo
void
PrimaryPartition::SetTo(const partition_descriptor *descriptor,
off_t ptsOffset, int32 blockSize)
PrimaryPartition::SetTo(const partition_descriptor *descriptor, off_t ptsOffset)
{
Unset();
Partition::SetTo(descriptor, ptsOffset, 0, blockSize);
Partition::SetTo(descriptor, ptsOffset, 0);
}
// Unset
@@ -488,27 +487,25 @@ LogicalPartition::LogicalPartition()
// constructor
LogicalPartition::LogicalPartition(const partition_descriptor *descriptor,
off_t ptsOffset, int32 blockSize,
PrimaryPartition *primary)
off_t ptsOffset, PrimaryPartition *primary)
: Partition(),
fPrimary(NULL),
fNext(NULL),
fPrevious(NULL)
{
SetTo(descriptor, ptsOffset, blockSize, primary);
SetTo(descriptor, ptsOffset, primary);
}
// SetTo
void
LogicalPartition::SetTo(const partition_descriptor *descriptor,
off_t ptsOffset, int32 blockSize,
PrimaryPartition *primary)
off_t ptsOffset, PrimaryPartition *primary)
{
Unset();
if (descriptor && primary) {
off_t baseOffset = (descriptor->is_extended() ? primary->Offset()
: ptsOffset);
Partition::SetTo(descriptor, ptsOffset, baseOffset, blockSize);
Partition::SetTo(descriptor, ptsOffset, baseOffset);
fPrimary = primary;
}
}
@@ -619,12 +616,12 @@ PartitionMap::PartitionAt(int32 index) const
// Check
bool
PartitionMap::Check(off_t sessionSize, int32 blockSize) const
PartitionMap::Check(off_t sessionSize) const
{
int32 partitionCount = CountPartitions();
// 1. check partition locations
for (int32 i = 0; i < partitionCount; i++) {
if (!PartitionAt(i)->CheckLocation(sessionSize, blockSize))
if (!PartitionAt(i)->CheckLocation(sessionSize))
return false;
}
// 2. check overlapping of partitions and location of PTSs