From a8329b9e51097c6ce041e23442a4a9fc9d328022 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 20 Jul 2021 19:43:19 +0300 Subject: [PATCH] partitionmanager: read capacity of btrfs devices via btrfs command upstream commits: https://github.com/KDE/kpmcore/commit/20bb8eba7ec9c57da4e24415e54a3b84909744c1 https://github.com/KDE/kpmcore/commit/f787af70fccd3f634303a53d2fa27021f2e1c525 Signed-off-by: Ivailo Monev --- partitionmanager/src/fs/btrfs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/partitionmanager/src/fs/btrfs.cpp b/partitionmanager/src/fs/btrfs.cpp index 56902783..1bda0426 100644 --- a/partitionmanager/src/fs/btrfs.cpp +++ b/partitionmanager/src/fs/btrfs.cpp @@ -54,7 +54,7 @@ namespace FS m_Create = findExternal("mkfs.btrfs") ? cmdSupportFileSystem : cmdSupportNone; m_Check = findExternal("btrfsck", QStringList(), 1) ? cmdSupportFileSystem : cmdSupportNone; m_Grow = (m_Check != cmdSupportNone && findExternal("btrfs")) ? cmdSupportFileSystem : cmdSupportNone; - m_GetUsed = findExternal("btrfs-debug-tree") ? cmdSupportFileSystem : cmdSupportNone; + m_GetUsed = findExternal("btrfs") ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = (m_Grow != cmdSupportNone && m_GetUsed != cmdSupportNone) ? cmdSupportFileSystem : cmdSupportNone; m_SetLabel = findExternal("btrfs") ? cmdSupportFileSystem : cmdSupportNone; @@ -107,11 +107,11 @@ namespace FS qint64 btrfs::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd("btrfs-debug-tree", QStringList() << deviceNode); + ExternalCommand cmd(QLatin1String("btrfs"), QStringList() << QLatin1String("filesystem") << QLatin1String("show") << QLatin1String("--raw") << deviceNode); if (cmd.run()) { - QRegExp rxBytesUsed(" bytes used (\\d+)"); + QRegExp rxBytesUsed(QLatin1String(" used (\\d+) path ") + deviceNode); if (rxBytesUsed.indexIn(cmd.output()) != -1) return rxBytesUsed.cap(1).toLongLong(); -- 2.11.0