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

Make initLUKS function non-static.

This commit is contained in:
Andrius Štikonas 2016-11-30 17:18:51 +00:00
parent 52b356e45f
commit 2e960d5c00
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/lvmdevice.cpp
View File

@ -131,8 +131,10 @@ Partition* LvmDevice::scanPartition(const QString& lvPath, PartitionTable* pTabl
// Handle LUKS partition
if (fs->type() == FileSystem::Luks) {
r |= PartitionRole::Luks;
FS::luks::initLUKS(fs);
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
FS::luks* luksFs = static_cast<FS::luks*>(fs);
luksFs->initLUKS();
QString mapperNode = luksFs->mapperName();
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
mounted = FileSystem::detectMountStatus(fs, mapperNode);
} else {

17
src/fs/luks.cpp
View File

@ -642,17 +642,14 @@ bool luks::canEncryptType(FileSystem::Type type)
}
}
void luks::initLUKS(FileSystem* fs)
void luks::initLUKS()
{
if (fs->type() == FileSystem::Luks) {
FS::luks* luksFS = static_cast<FS::luks*>(fs);
QString mapperNode = luksFS->mapperName();
bool isCryptOpen = !mapperNode.isEmpty();
luksFS->setCryptOpen(isCryptOpen);
if (isCryptOpen) {
luksFS->loadInnerFileSystem(mapperNode);
luksFS->setMounted(detectMountStatus(luksFS->innerFS(), mapperNode));
}
QString mapperNode = mapperName();
bool isCryptOpen = !mapperNode.isEmpty();
setCryptOpen(isCryptOpen);
if (isCryptOpen) {
loadInnerFileSystem(mapperNode);
setMounted(detectMountStatus(innerFS(), mapperNode));
}
}

2
src/fs/luks.h
View File

@ -181,7 +181,7 @@ public:
qint64 payloadOffset() const { return m_PayloadOffset; }
static bool canEncryptType(FileSystem::Type type);
static void initLUKS(FileSystem* fs);
void initLUKS();
protected:
virtual QString readOuterUUID(const QString& deviceNode) const;

5
src/plugins/libparted/libpartedbackend.cpp
View File

@ -340,8 +340,9 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk)
// libparted does not handle LUKS partitions
if (fs->type() == FileSystem::Luks) {
r |= PartitionRole::Luks;
FS::luks::initLUKS(fs);
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
FS::luks* luksFs = static_cast<FS::luks*>(fs);
luksFs->initLUKS();
QString mapperNode = luksFs->mapperName();
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
mounted = FileSystem::detectMountStatus(fs, mapperNode);
} else {