commit 4b86b04e3b626aa4472208279a345756c001827c
author Elliott Hughes <enh@google.com> Sat May 16 01:42:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 16 01:42:04 2015 +0000
tree 2b828269e9cfd9bd6dba137bd5fe72529f8ca175
parent 64f3e1a283ee33a5eaaef753e93de10ecf8b503a
parent 0b1e527a804b8593d352e00738ed57dafd4b3f45

am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."

* commit '0b1e527a804b8593d352e00738ed57dafd4b3f45':
  Don't use TEMP_FAILURE_RETRY on close in recovery.

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index 532e7b8..a0e9aec 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -694,7 +694,7 @@
 
 wsout:
     if (fd != -1) {
-        TEMP_FAILURE_RETRY(close(fd));
+        close(fd);
     }
 
     if (fn) {
@@ -1732,7 +1732,7 @@
         if (fsync(params.fd) == -1) {
             fprintf(stderr, "fsync failed: %s\n", strerror(errno));
         }
-        TEMP_FAILURE_RETRY(close(params.fd));
+        close(params.fd);
     }
 
     if (logcmd) {