commit 456483d19379391b05be2363cc740ee2d93b10e3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 15 23:46:14 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 15 23:46:14 2018 +0000
tree 2cc05c79d49cac9d893edb120e4875a4172ae615
parent 35829f396827137ccfd549b4f935a0b4867a4ceb
parent 9aec7a2fb6f368922dc9b332ca11fc9d58fcc956

Merge "mFusePid should be cleared after waitpid successfully"

TrimTask.cpp

diff --git a/TrimTask.cpp b/TrimTask.cpp
index 08e6499..0eea715 100644
--- a/TrimTask.cpp
+++ b/TrimTask.cpp
@@ -34,9 +34,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 
-/* From a would-be kernel header */
-#define FIDTRIM         _IOWR('f', 128, struct fstrim_range)    /* Deep discard trim */
-
 #define BENCHMARK_ENABLED 1
 
 using android::base::StringPrintf;
@@ -127,7 +124,7 @@
         range.len = ULLONG_MAX;
 
         nsecs_t start = systemTime(SYSTEM_TIME_BOOTTIME);
-        if (ioctl(fd, (mFlags & Flags::kDeepTrim) ? FIDTRIM : FITRIM, &range)) {
+        if (ioctl(fd, FITRIM, &range)) {
             PLOG(WARNING) << "Trim failed on " << path;
             notifyResult(path, -1, -1);
         } else {

tests/CryptfsScryptHidlizationEquivalence_test.cpp

diff --git a/tests/CryptfsScryptHidlizationEquivalence_test.cpp b/tests/CryptfsScryptHidlizationEquivalence_test.cpp
index 9c0d684..2905af2 100644
--- a/tests/CryptfsScryptHidlizationEquivalence_test.cpp
+++ b/tests/CryptfsScryptHidlizationEquivalence_test.cpp
@@ -369,6 +369,7 @@
     return keymaster_compatibility_cryptfs_scrypt();
 }
 
+#if 0
 /* Create a new keymaster key and store it in this footer */
 static int keymaster_create_key_new(struct crypt_mnt_ftr *ftr)
 {
@@ -390,6 +391,7 @@
     }
     return 0;
 }
+#endif
 
 /* This signs the given object using the keymaster key. */
 static int keymaster_sign_object_new(struct crypt_mnt_ftr *ftr,