commit aec86d3692a9271db027e4478178c02451c558cc
author Alistair Strachan <alistair.strachan@imgtec.com> Sun May 08 18:09:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun May 08 18:09:50 2016 +0000
tree 171e375828cf00e1ae4456fe35ba35ad66aede61
parent 24fdd7fbe7cda79a6d15a4cb1714286c18828135
parent eef053fda1ed84b71f245dfe2890fd35c2ffe3bc

Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7
am: eef053fda1

* commit 'eef053fda1ed84b71f245dfe2890fd35c2ffe3bc':
  updater, minzip: Remove unnecessary O_SYNC flags.

Change-Id: I013b5ea0bff4a8ac9f1b9ed1c4a1d18a67bb3b2c

minzip/Zip.c

diff --git a/minzip/Zip.c b/minzip/Zip.c
index 9f550f8..d557daa 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -968,7 +968,7 @@
                 setfscreatecon(secontext);
             }
 
-            int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC|O_SYNC,
+            int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC,
                 UNZIP_FILEMODE);
 
             if (secontext) {

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 4f52684..bab2fe1 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -559,7 +559,7 @@
         }
 
         {
-            int fd = TEMP_FAILURE_RETRY(ota_open(dest_path, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC,
+            int fd = TEMP_FAILURE_RETRY(ota_open(dest_path, O_WRONLY | O_CREAT | O_TRUNC,
                   S_IRUSR | S_IWUSR));
             if (fd == -1) {
                 printf("%s: can't open %s for write: %s\n", name, dest_path, strerror(errno));