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

Reserved blocks are not included in the number of free blocks anyway, so don't 

substract them.

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=901471
This commit is contained in:
Volker Lanz 2008-12-25 15:59:07 +00:00
parent 70766b856e
commit 577ffb39f5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fs/ext2.cpp
View File

@ -62,7 +62,7 @@ namespace FS
{ {
return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); return Capacity::unitFactor(Capacity::Byte, Capacity::EiB);
} }
qint64 ext2::readUsedCapacity(const QString& deviceNode) const qint64 ext2::readUsedCapacity(const QString& deviceNode) const
{ {
ExternalCommand cmd("dumpe2fs", QStringList() << "-h" << deviceNode); ExternalCommand cmd("dumpe2fs", QStringList() << "-h" << deviceNode);
@ -74,18 +74,12 @@ namespace FS
if (rxBlockCount.indexIn(cmd.output()) != -1) if (rxBlockCount.indexIn(cmd.output()) != -1)
blockCount = rxBlockCount.cap(1).toLongLong(); blockCount = rxBlockCount.cap(1).toLongLong();
qint64 reservedBlocks = -1;
QRegExp rxReservedBlocks("Reserved block count:\\s*(\\d+)");
if (rxReservedBlocks.indexIn(cmd.output()) != -1) qint64 freeBlocks = -1;
reservedBlocks = rxReservedBlocks.cap(1).toLongLong();
qint64 numFreeBlocks = -1;
QRegExp rxFreeBlocks("Free blocks:\\s*(\\d+)"); QRegExp rxFreeBlocks("Free blocks:\\s*(\\d+)");
if (rxFreeBlocks.indexIn(cmd.output()) != -1) if (rxFreeBlocks.indexIn(cmd.output()) != -1)
numFreeBlocks = rxFreeBlocks.cap(1).toLongLong(); freeBlocks = rxFreeBlocks.cap(1).toLongLong();
qint64 blockSize = -1; qint64 blockSize = -1;
QRegExp rxBlockSize("Block size:\\s*(\\d+)"); QRegExp rxBlockSize("Block size:\\s*(\\d+)");
@ -93,8 +87,8 @@ namespace FS
if (rxBlockSize.indexIn(cmd.output()) != -1) if (rxBlockSize.indexIn(cmd.output()) != -1)
blockSize = rxBlockSize.cap(1).toLongLong(); blockSize = rxBlockSize.cap(1).toLongLong();
if (blockCount > -1 && reservedBlocks > -1 && numFreeBlocks > -1 && blockSize > -1) if (blockCount > -1 && freeBlocks > -1 && blockSize > -1)
return (blockCount - reservedBlocks - numFreeBlocks) * blockSize; return (blockCount - freeBlocks) * blockSize;
} }
return -1; return -1;