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

Make sure KDiskFreeSpaceInfo is never used for swap.

This commit is contained in:
Andrius Štikonas 2016-11-15 17:00:59 +00:00
parent a78e6f986e
commit 3c58349561
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/lvmdevice.cpp
View File

@ -139,11 +139,11 @@ Partition* LvmDevice::scanPartition(const QString& lvPath, PartitionTable* pTabl
mountPoint = FileSystem::detectMountPoint(fs, lvPath);
mounted = FileSystem::detectMountStatus(fs, lvPath);
if (mountPoint != QString()) {
// KDiskFreeSpaceInfo does not work with swap
if (mountPoint != QString() && fs->type() != FileSystem::LinuxSwap) {
const KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint);
if (logicalSize() > 0 && fs->type() != FileSystem::Luks)
if (mounted && freeSpaceInfo.isValid() && mountPoint != QString())
fs->setSectorsUsed(freeSpaceInfo.used() / logicalSize());
if (logicalSize() > 0 && fs->type() != FileSystem::Luks && mounted && freeSpaceInfo.isValid())
fs->setSectorsUsed(freeSpaceInfo.used() / logicalSize());
}
else if (fs->supportGetUsed() == FileSystem::cmdSupportFileSystem)
fs->setSectorsUsed(qCeil(fs->readUsedCapacity(lvPath) / static_cast<float>(logicalSize())));

3
src/plugins/libparted/libpartedbackend.cpp
View File

@ -197,7 +197,8 @@ static void readSectorsUsed(PedDisk* pedDisk, const Device& d, Partition& p, con
if (mountPoint != QString()) {
const KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint);
if (p.isMounted() && freeSpaceInfo.isValid() && mountPoint != QString())
// KDiskFreeSpaceInfo does not work with swap
if (p.isMounted() && freeSpaceInfo.isValid() && mountPoint != QString() && p.fileSystem().type() != FileSystem::LinuxSwap)
p.fileSystem().setSectorsUsed(freeSpaceInfo.used() / d.logicalSize());
else if (p.fileSystem().supportGetUsed() == FileSystem::cmdSupportFileSystem)
p.fileSystem().setSectorsUsed(p.fileSystem().readUsedCapacity(p.deviceNode()) / d.logicalSize());