commit 62e1923194de067c0ac589abcfc4f04fdddf2b1a
author Tao Bao <tbao@google.com> Tue Jul 28 00:12:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 28 00:12:31 2015 +0000
tree d1e9b32f133e95afe5577964a2639fde15235f60
parent 6a4a33e39ea2fa8626335f6b9cccf407c71c0588
parent 187efff6f37bd6bd3ddae816a847afd16ff06c1d

Merge "updater: Hoist fsync() to outer loop."

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 258d975..77117db 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -192,11 +192,6 @@
         written += w;
     }
 
-    if (fsync(fd) == -1) {
-        fprintf(stderr, "fsync failed: %s\n", strerror(errno));
-        return -1;
-    }
-
     return 0;
 }
 
@@ -728,7 +723,7 @@
 
     fprintf(stderr, " writing %d blocks to %s\n", blocks, cn);
 
-    fd = TEMP_FAILURE_RETRY(open(fn, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, STASH_FILE_MODE));
+    fd = TEMP_FAILURE_RETRY(open(fn, O_WRONLY | O_CREAT | O_TRUNC, STASH_FILE_MODE));
 
     if (fd == -1) {
         fprintf(stderr, "failed to create \"%s\": %s\n", fn, strerror(errno));
@@ -1762,6 +1757,10 @@
         }
 
         if (params.canwrite) {
+            if (fsync(params.fd) == -1) {
+                fprintf(stderr, "fsync failed: %s\n", strerror(errno));
+                goto pbiudone;
+            }
             fprintf(cmd_pipe, "set_progress %.4f\n", (double) params.written / total_blocks);
             fflush(cmd_pipe);
         }