andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Fix LVM volume showing incorrect preview when creating new LV.

This commit is contained in:
Chantara Tith 2016-07-18 03:50:04 +07:00
parent 89db5b9131
commit 10696c87a7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/partitiontable.cpp
View File

@ -277,12 +277,9 @@ bool PartitionTable::getUnallocatedRange(const Device& d, PartitionNode& parent,
return end - start + 1 >= PartitionAlignment::sectorAlignment(device); return end - start + 1 >= PartitionAlignment::sectorAlignment(device);
} else if (d.type() == Device::LVM_Device) { } else if (d.type() == Device::LVM_Device) {
const LvmDevice& lvm = dynamic_cast<const LvmDevice&>(d); const LvmDevice& lvm = dynamic_cast<const LvmDevice&>(d);
if (lvm.freePE() && start >= lvm.allocatedPE()) { if (lvm.freePE() && start >= lvm.allocatedPE() && end < lvm.totalPE()) {
start = lvm.allocatedPE();
end = lvm.totalPE() - 1;
return true; return true;
} }
return false;
} }
return false; return false;
} }
@ -360,13 +357,17 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64
qint64 lastEnd = start; qint64 lastEnd = start;
foreach(Partition * child, p->children()) { if (d.type() == Device::LVM_Device && !p->children().isEmpty()) {
p->insert(createUnallocated(d, *p, lastEnd, child->firstSector() - 1)); lastEnd = p->children().last()->lastSector() + 1;
} else {
foreach(Partition * child, p->children()) {
p->insert(createUnallocated(d, *p, lastEnd, child->firstSector() - 1));
if (child->roles().has(PartitionRole::Extended)) if (child->roles().has(PartitionRole::Extended))
insertUnallocated(d, child, child->firstSector()); insertUnallocated(d, child, child->firstSector());
lastEnd = child->lastSector() + 1; lastEnd = child->lastSector() + 1;
}
} }
// Take care of the free space between the end of the last child and the end // Take care of the free space between the end of the last child and the end
@ -379,7 +380,7 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64
Q_ASSERT(extended); Q_ASSERT(extended);
} }
if (parentEnd >= firstUsable()) if (parentEnd >= firstUsable() && parentEnd >= lastEnd)
p->insert(createUnallocated(d, *p, lastEnd, parentEnd)); p->insert(createUnallocated(d, *p, lastEnd, parentEnd));
} }