commit f50b5a8a00fe2db9b4e369e92e49e09ab24efebd
author Elliott Hughes <enh@google.com> Thu Aug 27 14:46:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 27 14:46:07 2015 +0000
tree fbceea84cc6c6d3235f2dabc795ab5a7f72bb016
parent 59d092313899593c835877ba72841f13b3e209e2
parent debb3f8cba49db2dff687a5758aebdbbd99b6393

am debb3f8c: am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."

* commit 'debb3f8cba49db2dff687a5758aebdbbd99b6393':

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