From 83a5ad2731428d2c8217df4fb1ef6c87bdcca67b Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Wed, 2 May 2018 10:57:56 +0800
Subject: [PATCH 1/3] Add linux/types.h to cryptfs.h

This commit adds <linux/types.h> to cryptfs.h because cryptfs.h uses
`__le16` and `__le32` which are defined in <linux/types.h>.

The absence of <linux/types.h> will become an error after we sort the
headers in the upcoming commits.

Test: cd system/vold && mma
Change-Id: I9930105ee86f80a29295b59596b21335c68a8e23
Merged-In: I9930105ee86f80a29295b59596b21335c68a8e23
---
 cryptfs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cryptfs.h b/cryptfs.h
index d20d96d..07933e6 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -26,7 +26,10 @@
  * partition.
  */
 
+#include <linux/types.h>
 #include <stdbool.h>
+#include <stdint.h>
+
 #include <cutils/properties.h>
 
 /* The current cryptfs version */

From 862eef7ace9059b815e640605d3c7fedb05adcc8 Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Wed, 2 May 2018 11:36:45 +0800
Subject: [PATCH 2/3] Reorder the include directives in cryptfs.cpp

This commit reorders the include directives in cryptfs.cpp so that
upcoming <cutils/log.h> change can be obvious.

Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I9d2ea66c15b7b68014a67ba7c1420075953459ba
Merged-In: I9d2ea66c15b7b68014a67ba7c1420075953459ba
---
 cryptfs.cpp | 75 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 2606959..c152631 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -20,49 +20,54 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
+#define LOG_TAG "Cryptfs"
+
+#include "cryptfs.h"
+
+#include "EncryptInplace.h"
+#include "Ext4Crypt.h"
+#include "Keymaster.h"
+#include "Process.h"
+#include "ScryptParameters.h"
+#include "VoldUtil.h"
+#include "VolumeManager.h"
+#include "secontext.h"
+
+#include <bootloader_message/bootloader_message.h>
+#include <ext4_utils/ext4.h>
+#include <ext4_utils/ext4_utils.h>
+#include <fs_mgr.h>
+#include <logwrap/logwrap.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+#include <selinux/selinux.h>
+#include "android-base/properties.h"
+#include "cutils/android_reboot.h"
+#include "cutils/log.h"
+#include "cutils/properties.h"
+#include "f2fs_sparseblock.h"
+#include "hardware_legacy/power.h"
+
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <linux/dm-ioctl.h>
 #include <libgen.h>
+#include <linux/dm-ioctl.h>
+#include <linux/kdev_t.h>
+#include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <openssl/evp.h>
-#include <openssl/sha.h>
-#include <errno.h>
-#include <ext4_utils/ext4.h>
-#include <ext4_utils/ext4_utils.h>
-#include <linux/kdev_t.h>
-#include <fs_mgr.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <time.h>
-#include <math.h>
-#include <selinux/selinux.h>
-#include "cryptfs.h"
-#include "secontext.h"
-#define LOG_TAG "Cryptfs"
-#include "cutils/log.h"
-#include "cutils/properties.h"
-#include "cutils/android_reboot.h"
-#include "hardware_legacy/power.h"
-#include <logwrap/logwrap.h>
-#include "ScryptParameters.h"
-#include "VolumeManager.h"
-#include "VoldUtil.h"
-#include "Ext4Crypt.h"
-#include "f2fs_sparseblock.h"
-#include "EncryptInplace.h"
-#include "Process.h"
-#include "Keymaster.h"
-#include "android-base/properties.h"
-#include <bootloader_message/bootloader_message.h>
+#include <unistd.h>
+
 extern "C" {
 #include <crypto_scrypt.h>
 }

From 196d5850f28b23164c024370e9403fe184d2a7b2 Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Wed, 2 May 2018 11:39:03 +0800
Subject: [PATCH 3/3] Replace library headers with angle quotations

This commit replaces the double quotations for library headers with
angle quotations.

Test: cd system/vold && mma
Change-Id: I3c14cfcf80f29173669409df548af84c1b39b96d
Merged-In: I3c14cfcf80f29173669409df548af84c1b39b96d
---
 cryptfs.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cryptfs.cpp b/cryptfs.cpp
index c152631..e8bf3aa 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -33,20 +33,20 @@
 #include "VolumeManager.h"
 #include "secontext.h"
 
+#include <android-base/properties.h>
 #include <bootloader_message/bootloader_message.h>
+#include <cutils/android_reboot.h>
+#include <cutils/log.h>
+#include <cutils/properties.h>
 #include <ext4_utils/ext4.h>
 #include <ext4_utils/ext4_utils.h>
+#include <f2fs_sparseblock.h>
 #include <fs_mgr.h>
+#include <hardware_legacy/power.h>
 #include <logwrap/logwrap.h>
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 #include <selinux/selinux.h>
-#include "android-base/properties.h"
-#include "cutils/android_reboot.h"
-#include "cutils/log.h"
-#include "cutils/properties.h"
-#include "f2fs_sparseblock.h"
-#include "hardware_legacy/power.h"
 
 #include <ctype.h>
 #include <errno.h>