commit 8890d429392051234ecb50ddf0c12d98911e75f0
author Tom Cherry <tomcherry@google.com> Tue Mar 31 21:52:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 31 21:52:39 2020 +0000
tree a882c6d46371fed2288082bd00f3bc439890441d
parent f8dc296dfdc1db4c0f259ed299f6abff14befda6
parent e4a6ed853416232b25bd51da61864b5e3096fd12

Merge "fastbootd: sync() after flashing partitions or updating super"

fastboot/device/flashing.cpp

diff --git a/fastboot/device/flashing.cpp b/fastboot/device/flashing.cpp
index 7e7e507..fd6ff8e 100644
--- a/fastboot/device/flashing.cpp
+++ b/fastboot/device/flashing.cpp
@@ -135,7 +135,9 @@
         return -EOVERFLOW;
     }
     WipeOverlayfsForPartition(device, partition_name);
-    return FlashBlockDevice(handle.fd(), data);
+    int result = FlashBlockDevice(handle.fd(), data);
+    sync();
+    return result;
 }
 
 bool UpdateSuper(FastbootDevice* device, const std::string& super_name, bool wipe) {
@@ -165,6 +167,7 @@
             return device->WriteFail("Unable to flash new partition table");
         }
         fs_mgr_overlayfs_teardown();
+        sync();
         return device->WriteOkay("Successfully flashed partition table");
     }
 
@@ -204,5 +207,6 @@
         return device->WriteFail("Unable to write new partition table");
     }
     fs_mgr_overlayfs_teardown();
+    sync();
     return device->WriteOkay("Successfully updated partition table");
 }