From b950141986cf255bc99f6472552a3f7a80995427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 9 Dec 2012 13:15:49 +0000 Subject: [PATCH] Correct some partition size limits. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1327833 --- src/fs/btrfs.cpp | 2 +- src/fs/exfat.cpp | 2 +- src/fs/ext2.cpp | 2 +- src/fs/ext3.cpp | 6 ++++++ src/fs/ext3.h | 1 + src/fs/ext4.cpp | 6 ++++++ src/fs/ext4.h | 1 + src/fs/fat32.cpp | 2 +- src/fs/hfsplus.cpp | 2 +- src/fs/linuxswap.cpp | 1 + src/fs/luks.cpp | 4 ++-- src/fs/luks.h | 2 +- src/fs/lvm2_pv.cpp | 4 ++-- src/fs/lvm2_pv.h | 3 +-- src/fs/nilfs2.cpp | 2 +- src/fs/ocfs2.cpp | 7 ++++++- src/fs/ocfs2.h | 1 + src/fs/xfs.cpp | 2 +- 18 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index a5370d7..051b142 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -97,7 +97,7 @@ namespace FS qint64 btrfs::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 16 * 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 f111444..fe272a9 100644 --- a/src/fs/exfat.cpp +++ b/src/fs/exfat.cpp @@ -86,7 +86,7 @@ namespace FS qint64 exfat::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 64 * Capacity::unitFactor(Capacity::Byte, Capacity::ZiB); } bool exfat::check(Report& report, const QString& deviceNode) const diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp index 73a6242..07f189d 100644 --- a/src/fs/ext2.cpp +++ b/src/fs/ext2.cpp @@ -85,7 +85,7 @@ namespace FS qint64 ext2::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 32 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB); } qint64 ext2::readUsedCapacity(const QString& deviceNode) const diff --git a/src/fs/ext3.cpp b/src/fs/ext3.cpp index 1513be5..b7e9611 100644 --- a/src/fs/ext3.cpp +++ b/src/fs/ext3.cpp @@ -20,6 +20,7 @@ #include "fs/ext3.h" #include "util/externalcommand.h" +#include "util/capacity.h" #include @@ -30,6 +31,11 @@ namespace FS { } + qint64 ext3::maxCapacity() const + { + return 32 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB); + } + bool ext3::create(Report& report, const QString& deviceNode) const { ExternalCommand cmd(report, "mkfs.ext3", QStringList() << "-q" << deviceNode); diff --git a/src/fs/ext3.h b/src/fs/ext3.h index 443e2e7..72e47ae 100644 --- a/src/fs/ext3.h +++ b/src/fs/ext3.h @@ -47,6 +47,7 @@ namespace FS public: static void init() {} virtual bool create(Report& report, const QString& deviceNode) const; + virtual qint64 maxCapacity() const; }; } diff --git a/src/fs/ext4.cpp b/src/fs/ext4.cpp index fd478a0..2d66a84 100644 --- a/src/fs/ext4.cpp +++ b/src/fs/ext4.cpp @@ -20,6 +20,7 @@ #include "fs/ext4.h" #include "util/externalcommand.h" +#include "util/capacity.h" #include @@ -30,6 +31,11 @@ namespace FS { } + qint64 ext4::maxCapacity() const + { + return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + } + bool ext4::create(Report& report, const QString& deviceNode) const { ExternalCommand cmd(report, "mkfs.ext4", QStringList() << "-q" << deviceNode); diff --git a/src/fs/ext4.h b/src/fs/ext4.h index 6946a83..a2c05cb 100644 --- a/src/fs/ext4.h +++ b/src/fs/ext4.h @@ -47,6 +47,7 @@ namespace FS public: static void init() {} virtual bool create(Report& report, const QString& deviceNode) const; + virtual qint64 maxCapacity() const; }; } diff --git a/src/fs/fat32.cpp b/src/fs/fat32.cpp index 2745bc3..da14ed8 100644 --- a/src/fs/fat32.cpp +++ b/src/fs/fat32.cpp @@ -40,7 +40,7 @@ namespace FS qint64 fat32::maxCapacity() const { - return 8 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB); + return 16 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB); } bool fat32::create(Report& report, const QString& deviceNode) const diff --git a/src/fs/hfsplus.cpp b/src/fs/hfsplus.cpp index 7789658..bc86659 100644 --- a/src/fs/hfsplus.cpp +++ b/src/fs/hfsplus.cpp @@ -70,7 +70,7 @@ namespace FS qint64 hfsplus::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 8 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } bool hfsplus::check(Report& report, const QString& deviceNode) const diff --git a/src/fs/linuxswap.cpp b/src/fs/linuxswap.cpp index d0f72b4..3f80fb0 100644 --- a/src/fs/linuxswap.cpp +++ b/src/fs/linuxswap.cpp @@ -19,6 +19,7 @@ #include "fs/linuxswap.h" +#include "util/capacity.h" #include "util/externalcommand.h" #include diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index c6dfc13..7e5f609 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -76,9 +76,9 @@ namespace FS return SupportTool("cryptsetup", KUrl("https://code.google.com/p/cryptsetup/")); } - qint64 luks::maxCapacity() const + qint64 luks::minCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 3 * Capacity::unitFactor(Capacity::Byte, Capacity::MiB); } QString luks::readUUID(const QString& deviceNode) const diff --git a/src/fs/luks.h b/src/fs/luks.h index ccf028b..5761ecc 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -57,7 +57,7 @@ namespace FS virtual CommandSupportType supportUpdateUUID() const { return m_UpdateUUID; } virtual CommandSupportType supportGetUUID() const { return m_GetUUID; } - virtual qint64 maxCapacity() const; + virtual qint64 minCapacity() const; virtual SupportTool supportToolName() const; virtual bool supportToolFound() const; virtual QString readUUID(const QString& deviceNode) const; diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index 2b7d564..c9863b6 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -82,9 +82,9 @@ namespace FS return SupportTool("lvm2", KUrl("http://sourceware.org/lvm2/")); } - qint64 lvm2_pv::maxCapacity() const + qint64 lvm2_pv::minCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 5 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } bool lvm2_pv::check(Report& report, const QString& deviceNode) const diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 753538c..61ea8d3 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -65,8 +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 qint64 minCapacity() const; virtual SupportTool supportToolName() const; virtual bool supportToolFound() const; diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp index 1fce21d..a68cc79 100644 --- a/src/fs/nilfs2.cpp +++ b/src/fs/nilfs2.cpp @@ -100,7 +100,7 @@ namespace FS qint64 nilfs2::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 8 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } bool nilfs2::check(Report& report, const QString& deviceNode) const diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp index 0c4f455..068dba3 100644 --- a/src/fs/ocfs2.cpp +++ b/src/fs/ocfs2.cpp @@ -90,9 +90,14 @@ namespace FS return SupportTool("ocfs2-tools", KUrl("http://oss.oracle.com/projects/ocfs2-tools/")); } + qint64 ocfs2::minCapacity() const + { + return 14000 * Capacity::unitFactor(Capacity::Byte, Capacity::KiB); + } + qint64 ocfs2::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 4 * Capacity::unitFactor(Capacity::Byte, Capacity::PiB); } qint64 ocfs2::readUsedCapacity(const QString& deviceNode) const diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h index 237f961..fba5fc2 100644 --- a/src/fs/ocfs2.h +++ b/src/fs/ocfs2.h @@ -64,6 +64,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 1ae9d04..971aad3 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -92,7 +92,7 @@ namespace FS qint64 xfs::maxCapacity() const { - return Capacity::unitFactor(Capacity::Byte, Capacity::EiB); + return 8 * Capacity::unitFactor(Capacity::Byte, Capacity::EiB); } qint64 xfs::readUsedCapacity(const QString& deviceNode) const