diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-08-26 08:28:37 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2020-08-26 08:31:10 +0200 |
| commit | 1fb59b58ee9ec9215880dfa218d709fae02f6a53 (patch) | |
| tree | 4c36c513909f7e1d306fd28a21f7e8cadd47b065 /src/Main/Forms/VolumeFormatOptionsWizardPage.cpp | |
| parent | 0ab412a8de6a1557bd0f22d91a638e30b4f20ba8 (diff) | |
| download | VeraCrypt-1fb59b58ee9ec9215880dfa218d709fae02f6a53.tar.gz VeraCrypt-1fb59b58ee9ec9215880dfa218d709fae02f6a53.zip | |
Linux: Reduce minimal size requirement for BTRFS support to 16 MiB by using mixed mode for volumes whose size is less than 109 MiB
Diffstat (limited to 'src/Main/Forms/VolumeFormatOptionsWizardPage.cpp')
| -rw-r--r-- | src/Main/Forms/VolumeFormatOptionsWizardPage.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp index 30f8c6ba..d3bd5216 100644 --- a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp +++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp @@ -17,7 +17,7 @@ namespace VeraCrypt { - VolumeFormatOptionsWizardPage::VolumeFormatOptionsWizardPage (wxPanel* parent, uint64 volumeSize, uint32 sectorSize, bool enableQuickFormatButton, bool disableNoneFilesystem, bool disable32bitFilesystems) + VolumeFormatOptionsWizardPage::VolumeFormatOptionsWizardPage (wxPanel* parent, uint64 filesystemSize, uint32 sectorSize, bool enableQuickFormatButton, bool disableNoneFilesystem, bool disable32bitFilesystems) : VolumeFormatOptionsWizardPageBase (parent) { InfoStaticText->SetLabel (_( @@ -26,7 +26,7 @@ namespace VeraCrypt if (!disableNoneFilesystem) FilesystemTypeChoice->Append (LangString["NONE"], (void *) VolumeCreationOptions::FilesystemType::None); - if (!disable32bitFilesystems && volumeSize <= TC_MAX_FAT_SECTOR_COUNT * sectorSize) + if (!disable32bitFilesystems && filesystemSize <= TC_MAX_FAT_SECTOR_COUNT * sectorSize) FilesystemTypeChoice->Append (L"FAT", (void *) VolumeCreationOptions::FilesystemType::FAT); #ifdef TC_WINDOWS @@ -43,9 +43,8 @@ namespace VeraCrypt FilesystemTypeChoice->Append (L"exFAT", (void *) VolumeCreationOptions::FilesystemType::exFAT); if (VolumeCreationOptions::FilesystemType::IsFsFormatterPresent (VolumeCreationOptions::FilesystemType::Btrfs)) { - uint64 minVolumeSizeForBtrfs = VC_MIN_BTRFS_VOLUME_SIZE + (uint64) (VC_MAX (TC_TOTAL_VOLUME_HEADERS_SIZE, TC_HIDDEN_VOLUME_HOST_FS_RESERVED_END_AREA_SIZE_HIGH)); - // minimum size to be able to format as Btrfs is 114294784 bytes - if (volumeSize >= minVolumeSizeForBtrfs) + // minimum size to be able to format as Btrfs is 16777216 bytes + if (filesystemSize >= VC_MIN_SMALL_BTRFS_VOLUME_SIZE) FilesystemTypeChoice->Append (L"Btrfs", (void *) VolumeCreationOptions::FilesystemType::Btrfs); } #elif defined (TC_MACOSX) @@ -57,7 +56,7 @@ namespace VeraCrypt FilesystemTypeChoice->Append (L"UFS", (void *) VolumeCreationOptions::FilesystemType::UFS); #endif - if (!disable32bitFilesystems && volumeSize <= TC_MAX_FAT_SECTOR_COUNT * sectorSize) + if (!disable32bitFilesystems && filesystemSize <= TC_MAX_FAT_SECTOR_COUNT * sectorSize) SetFilesystemType (VolumeCreationOptions::FilesystemType::FAT); else SetFilesystemType (VolumeCreationOptions::FilesystemType::GetPlatformNative()); |