From 2e960d5c0026bcd6870b8e6c3d38255e24e1ca15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Wed, 30 Nov 2016 17:18:51 +0000
Subject: [PATCH] Make initLUKS function non-static.

---
 src/core/lvmdevice.cpp                     |  6 ++++--
 src/fs/luks.cpp                            | 17 +++++++----------
 src/fs/luks.h                              |  2 +-
 src/plugins/libparted/libpartedbackend.cpp |  5 +++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp
index 377594d..861363c 100644
--- a/src/core/lvmdevice.cpp
+++ b/src/core/lvmdevice.cpp
@@ -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 {
diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index a11d75d..95b6afe 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -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));
     }
 }
 
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 41d1ac4..e481829 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -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;
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index dc5262a..abc622b 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -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 {