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

Mark luks sector size to be constexpr.

This commit is contained in:
Andrius Štikonas 2016-09-12 19:43:58 +01:00
parent 874900fe72
commit 5592c05ef3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fs/luks.cpp
View File

@ -61,7 +61,6 @@ luks::luks(qint64 firstsector,
, m_isCryptOpen(false)
, m_cryptsetupFound(m_Create != cmdSupportNone)
, m_isMounted(false)
, m_logicalSectorSize(512)
{
}
@ -486,7 +485,7 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c
else if (m_innerFs->resize(report, mapperName(), payloadLength))
{
ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"),
{ QStringLiteral("--size"), QString::number(payloadLength / /*m_logicalSectorSize*/ 512), // LUKS assume 512 bytes sector
{ QStringLiteral("--size"), QString::number(payloadLength / m_logicalSectorSize), // LUKS assumes 512 bytes sector
QStringLiteral("resize"), mapperName() });
report.line() << xi18nc("@info:progress", "Resizing LUKS crypt on partition <filename>%1</filename>.", deviceNode);
if (cryptResizeCmd.run(-1) && cryptResizeCmd.exitCode() == 0)

6
src/fs/luks.h
View File

@ -105,10 +105,6 @@ public:
return m_GetUUID;
}
void setLogicalSectorSize(unsigned int logicalSectorSize) {
m_logicalSectorSize = logicalSectorSize;
}
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
SupportTool supportToolName() const override;
@ -189,7 +185,7 @@ private:
mutable bool m_cryptsetupFound;
QString m_passphrase;
bool m_isMounted;
unsigned int m_logicalSectorSize;
constexpr static unsigned int m_logicalSectorSize = 512;
QString m_MapperName;
QString m_CipherName;