commit 46c7b09e3907dc062922872cb707689a8d5e23e8
author Elliott Hughes <enh@google.com> Thu Oct 29 20:47:46 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 29 20:47:46 2015 +0000
tree 23031ea2477055014cf617b6cce241695f11c8ae
parent da44c063201c8febbd7ab121ef47ca178036e917
parent 8185d3d8ba3dec0f26ade8cd4764d5f09cc00bcc

Merge "Fix ioctl parameter" am: 0eaad8ce8c am: 5cd32f73d8
am: 8185d3d8ba

* commit '8185d3d8ba3dec0f26ade8cd4764d5f09cc00bcc':
  Fix ioctl parameter

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index a9a8031..3a87741 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -44,8 +44,6 @@
 #include "Process.h"
 #include "Loop.h"
 #include "Devmapper.h"
-#include "Ext4Crypt.h"
-#include "cryptfs.h"
 #include "MoveTask.h"
 #include "TrimTask.h"
 

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
old mode 100755
new mode 100644

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index b947822..87b131e 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -43,7 +43,7 @@
 status_t Check(const std::string& source) {
     std::vector<std::string> cmd;
     cmd.push_back(kFsckPath);
-    cmd.push_back("-f");
+    cmd.push_back("-a");
     cmd.push_back(source);
 
     // f2fs devices are currently always trusted