From 82243234e34466bebd5fe18a60805304eb4dbade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Wed, 11 May 2016 23:00:37 +0100
Subject: [PATCH] We no longer need to fill partition sizes. KPMCore now tracks
 max fs size (including inside luks).

---
 src/fs/btrfs.cpp             | 4 ++--
 src/fs/ext2.cpp              | 3 +--
 src/fs/reiserfs.cpp          | 6 ++----
 src/ops/restoreoperation.cpp | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp
index cbf2de6..6b1c053 100644
--- a/src/fs/btrfs.cpp
+++ b/src/fs/btrfs.cpp
@@ -145,8 +145,8 @@ bool btrfs::resize(Report& report, const QString& deviceNode, qint64 length) con
                              { QStringLiteral("--verbose"),  QStringLiteral("--types"), QStringLiteral("btrfs"), deviceNode, tempDir.path() });
 
     if (mountCmd.run(-1) && mountCmd.exitCode() == 0) {
-        QString len = length == -1 ? QStringLiteral("max") : QString::number(length);
-        ExternalCommand resizeCmd(report, QStringLiteral("btrfs"), { QStringLiteral("filesystem"), QStringLiteral("resize"), len, tempDir.path() });
+        ExternalCommand resizeCmd(report, QStringLiteral("btrfs"),
+                                  { QStringLiteral("filesystem"), QStringLiteral("resize"), QString::number(length), tempDir.path() });
 
         if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0)
             rval = true;
diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp
index 78f95af..80a2f72 100644
--- a/src/fs/ext2.cpp
+++ b/src/fs/ext2.cpp
@@ -137,9 +137,8 @@ bool ext2::create(Report& report, const QString& deviceNode) const
 bool ext2::resize(Report& report, const QString& deviceNode, qint64 length) const
 {
     const QString len = QString::number(length / 512) + QStringLiteral("s");
-    const QStringList args = length == -1 ? QStringList() << deviceNode : QStringList() << deviceNode <<  len;
 
-    ExternalCommand cmd(report, QStringLiteral("resize2fs"), args);
+    ExternalCommand cmd(report, QStringLiteral("resize2fs"), { deviceNode, len });
     return cmd.run(-1) && cmd.exitCode() == 0;
 }
 
diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp
index 41925fb..0f5b5b6 100644
--- a/src/fs/reiserfs.cpp
+++ b/src/fs/reiserfs.cpp
@@ -148,10 +148,8 @@ bool reiserfs::create(Report& report, const QString& deviceNode) const
 
 bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) const
 {
-    const QStringList args = length == -1 ?
-                                     QStringList() << deviceNode << QStringLiteral("-q") :
-                                     QStringList() << deviceNode << QStringLiteral("-q") << QStringLiteral("-s") << QString::number(length);
-    ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"), args);
+    ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"),
+                        { deviceNode, QStringLiteral("-q"), QStringLiteral("-s"), QString::number(length) });
 
     bool rval = cmd.start(-1);
 
diff --git a/src/ops/restoreoperation.cpp b/src/ops/restoreoperation.cpp
index 682da99..56d98ee 100644
--- a/src/ops/restoreoperation.cpp
+++ b/src/ops/restoreoperation.cpp
@@ -30,8 +30,8 @@
 #include "jobs/resizefilesystemjob.h"
 
 #include "fs/filesystem.h"
-#include "fs/luks.h"
 #include "fs/filesystemfactory.h"
+#include "fs/luks.h"
 
 #include "util/capacity.h"
 #include "util/report.h"