Use cylinder size of the device as minimum partition size.

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=908074
This commit is contained in:
Volker Lanz 2009-01-09 08:41:25 +00:00
parent 306667e09e
commit 5c7cc1eceb
4 changed files with 5 additions and 9 deletions

View File

@ -179,7 +179,7 @@ static void scanDevicePartitions(PedDevice* pedDevice, Device& d, PedDisk* pedDi
while ((pedPartition = ped_disk_next_partition(pedDisk, pedPartition)))
{
if (pedPartition->geom.end - pedPartition->geom.start < Partition::minimumPartitionSectors() || pedPartition->num < 1)
if (pedPartition->num < 1)
continue;
PartitionRole::Roles r = PartitionRole::None;

View File

@ -156,8 +156,6 @@ class Partition : public PartitionNode
void adjustLogicalNumbers(qint32 deletedNumber, qint32 insertedNumber);
void checkChildrenMounted();
static qint64 minimumPartitionSectors() { return m_MinimumPartitionSectors; } /**< @return the minimum number of sectors any Partition must be long */
protected:
void append(Partition* p) { m_Children.append(p); }
void setDevicePath(const QString& s) { m_DevicePath = s; }
@ -192,8 +190,6 @@ class Partition : public PartitionNode
bool m_IsMounted;
qint32 m_SectorSize;
State m_State;
static const qint64 m_MinimumPartitionSectors = 8192;
};
#endif

View File

@ -447,7 +447,7 @@ Partition* createUnallocated(const Device& device, PartitionNode& parent, qint64
r |= PartitionRole::Logical;
}
if (end - start < Partition::minimumPartitionSectors())
if (end - start < device.cylinderSize())
return NULL;
return new Partition(&parent, device, PartitionRole(r), FileSystemFactory::create(FileSystem::Unknown, start, end), start, end, -1);
@ -510,7 +510,7 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64
{
Partition* child = p->children()[i];
if (child->firstSector() - lastEnd >= Partition::minimumPartitionSectors())
if (child->firstSector() - lastEnd >= d.cylinderSize())
p->insert(createUnallocated(d, *p, lastEnd, child->firstSector() - 1));
if (child->roles().has(PartitionRole::Extended))
@ -531,7 +531,7 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64
parentEnd = (extended != NULL) ? extended->lastSector() : -1;
}
if (parentEnd >= Partition::minimumPartitionSectors())
if (parentEnd >= d.cylinderSize())
p->insert(createUnallocated(d, *p, lastEnd, parentEnd));
}

View File

@ -337,7 +337,7 @@ bool PartResizerWidget::checkSnap(const Partition& child, qint64 delta) const
if (child.roles().has(PartitionRole::Unallocated))
return true;
return qAbs(delta) >= Partition::minimumPartitionSectors();
return qAbs(delta) >= device().cylinderSize();
}
void PartResizerWidget::resizeLogicals()