From 90baf68b40de640e827bb8ff204247f5208da233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 9 Dec 2012 15:08:37 +0000 Subject: [PATCH] Revert parts of the commit that changed maxCapacity to prevent integer overflow. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1327837 --- src/fs/btrfs.cpp | 2 +- src/fs/exfat.cpp | 2 +- src/fs/lvm2_pv.cpp | 2 +- src/fs/lvm2_pv.h | 2 +- src/fs/xfs.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index 051b142..a5370d7 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -97,7 +97,7 @@ namespace FS qint64 btrfs::maxCapacity() const { - return 16 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } qint64 btrfs::readUsedCapacity(const QString& deviceNode) const diff --git a/src/fs/exfat.cpp b/src/fs/exfat.cpp index fe272a9..f111444 100644 --- a/src/fs/exfat.cpp +++ b/src/fs/exfat.cpp @@ -86,7 +86,7 @@ namespace FS qint64 exfat::maxCapacity() const { - return 64 * Capacity::unitFactor(Capacity::Byte, Capacity::ZiB); + return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } bool exfat::check(Report& report, const QString& deviceNode) const diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index 9261e15..c87c9f1 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -82,7 +82,7 @@ namespace FS return SupportTool("lvm2", KUrl("http://sourceware.org/lvm2/")); } - qint64 lvm2_pv::minCapacity() const + qint64 lvm2_pv::maxCapacity() const { return 5 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 61ea8d3..f3ae3ff 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -65,7 +65,7 @@ namespace FS virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } - virtual qint64 minCapacity() const; + virtual qint64 maxCapacity() const; virtual SupportTool supportToolName() const; virtual bool supportToolFound() const; diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp index 971aad3..1ae9d04 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -92,7 +92,7 @@ namespace FS qint64 xfs::maxCapacity() const { - return 8 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } qint64 xfs::readUsedCapacity(const QString& deviceNode) const