Merge "Support default, pattern, pin and password encryption types"
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 95263a8..1ffa939 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -646,7 +646,7 @@
                 result |= fchmod(fd, privateFile ? 0640 : 0644);
             }
 
-            if (selinux_android_restorecon(ftsent->fts_path) < 0) {
+            if (selinux_android_restorecon(ftsent->fts_path, 0) < 0) {
                 SLOGE("restorecon failed for %s: %s\n", ftsent->fts_path, strerror(errno));
                 result |= -1;
             }
diff --git a/cryptfs.c b/cryptfs.c
index 4dd7a6b..b320ee2 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -54,6 +54,8 @@
 
 #define UNUSED __attribute__((unused))
 
+#define UNUSED __attribute__((unused))
+
 #define DM_CRYPT_BUF_SIZE 4096
 
 #define HASH_COUNT 2000