commit 8b5f9d74a045b60667acbd54988171b14d57212e
author Tao Bao <tbao@google.com> Thu Nov 05 18:07:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 05 18:07:57 2015 +0000
tree be608dde301d60b99f65325f914fd837549f8de0
parent c40d9afaa4cbac81b4794f21aacf51b326e71d84
parent e4a3da9f51ca1e02179a1e0851f26015f4ec07fa

Merge "uncrypt: remove O_SYNC to avoid time-out failures"
am: e4a3da9f51

* commit 'e4a3da9f51ca1e02179a1e0851f26015f4ec07fa':
  uncrypt: remove O_SYNC to avoid time-out failures

uncrypt/uncrypt.cpp

diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index aef4800..6db4382 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -234,7 +234,7 @@
     int wfd = -1;
     unique_fd wfd_holder(wfd);
     if (encrypted) {
-        wfd = open(blk_dev, O_WRONLY | O_SYNC);
+        wfd = open(blk_dev, O_WRONLY);
         wfd_holder = unique_fd(wfd);
         if (wfd == -1) {
             ALOGE("failed to open fd for writing: %s\n", strerror(errno));