commit de72a98328213a5929723913086b20023335d07b
author Andrew Dodd <atd7@cornell.edu> Wed Mar 11 18:07:48 2015 -0400
committer Dees Troy <dees_troy@teamw.in> Fri Mar 13 19:49:29 2015 +0100
tree ce248439f15e40d8ce2b5414d669d74f0b9ed942
parent f5c2d6ce24d77aa7c38544c6d2f55400237fdbe5

Revert "Force sync files written by minzip."

This has been causing significant performance degradation when flashing updates
for the entirety of 5.0.

I was originally hesitant to do this since we don't want unsynced files on an update,
however - Our updater-script unmounts /system at the end of installation, which
will force a sync.  As a result the issue Google was trying to fix won't be present
for our ZIPs.

This reverts commit a6c142f2a579ea5e7cdfbc88e6a061c55029265a.

Change-Id: I89b22e2677c4eda4d3e6338adc0046bf754d43b2

minzip/Zip.c

diff --git a/minzip/Zip.c b/minzip/Zip.c
index 70aff00..5070104 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -1067,8 +1067,7 @@
                     setfscreatecon(secontext);
                 }
 
-                int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC|O_SYNC
-                        , UNZIP_FILEMODE);
+                int fd = creat(targetFile, UNZIP_FILEMODE);
 
                 if (secontext) {
                     freecon(secontext);
@@ -1083,12 +1082,7 @@
                 }
 
                 bool ok = mzExtractZipEntryToFile(pArchive, pEntry, fd);
-                if (ok) {
-                    ok = (fsync(fd) == 0);
-                }
-                if (close(fd) != 0) {
-                    ok = false;
-                }
+                close(fd);
                 if (!ok) {
                     LOGE("Error extracting \"%s\"\n", targetFile);
                     ok = false;