OSDN Git Service

Stop dropping caches now we have kernel fix
authorPaul Lawrence <paullawrence@google.com>
Wed, 22 Jun 2016 16:24:51 +0000 (09:24 -0700)
committerPaul Lawrence <paullawrence@google.com>
Wed, 22 Jun 2016 16:24:51 +0000 (09:24 -0700)
Only merge once

https://partner-android-review.googlesource.com/#/c/619829/1

has been merged into kernel.

Bug: 28779973
Change-Id: Icef78d1e4381e89e07797c36f6f650033d313557

Ext4Crypt.cpp

index 28140d2..a7d359e 100644 (file)
@@ -171,13 +171,6 @@ static bool install_key(const std::string& key, std::string* raw_ref) {
     LOG(DEBUG) << "Added key " << key_id << " (" << ref << ") to keyring " << device_keyring
                << " in process " << getpid();
 
-    // *TODO* Remove this code when kernel is fixed - see b/28373400
-    // Kernel preserves caches across a key insertion with ext4ice, which leads
-    // to contradictory dirents
-    if (!android::base::WriteStringToFile("3", "/proc/sys/vm/drop_caches")) {
-        PLOG(ERROR) << "Failed to drop_caches";
-    }
-
     return true;
 }