| commit | 420868767fce0b464e06602ba018cb412d39ae6a | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Thu Nov 05 19:23:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 19:23:28 2020 +0000 |
| tree | 97eb3931bae7402e983315b421bd37f54a29c5f4 | |
| parent | 992e8dfdaa48b3f09a18d72f0fec01b3649d7b70 [diff] | |
| parent | 22f226245a1c399be7d2890d50fd56aadf49ebbe [diff] |
Merge "EncryptInplace: fsync cryptofd before reporting success" am: e244a15f34 am: 22f226245a Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1488376 Change-Id: I8e7152cce18b1ed8b5f1265c08e2abb403deef9c
diff --git a/EncryptInplace.cpp b/EncryptInplace.cpp index 8baed78..057b3ef 100644 --- a/EncryptInplace.cpp +++ b/EncryptInplace.cpp
@@ -345,6 +345,11 @@ if (success) success &= EncryptPendingData(); + if (success && fsync(cryptofd_) != 0) { + PLOG(ERROR) << "Error syncing " << crypto_blkdev_; + success = false; + } + if (!success) { LOG(ERROR) << "In-place encryption of " << DescribeFilesystem() << " failed"; return false;