From 95db36e1287988a7184cdcd87699ad07e068a639 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Wed, 20 May 2015 08:59:21 -0700
Subject: [PATCH] Don't use TEMP_FAILURE_RETRY on close()

See https://lkml.org/lkml/2005/9/10/129 for details.

Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
---
 base/file.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/file.cpp b/base/file.cpp
index 6b19818e0..9a340b7f8 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -51,7 +51,7 @@ bool ReadFileToString(const std::string& path, std::string* content) {
     return false;
   }
   bool result = ReadFdToString(fd, content);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result;
 }
 
@@ -102,7 +102,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path,
     ALOGE("android::WriteStringToFile write failed: %s", strerror(errno));
     return CleanUpAfterFailedWrite(path);
   }
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return true;
 }
 #endif
@@ -116,7 +116,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path) {
   }
 
   bool result = WriteStringToFd(content, fd);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result || CleanUpAfterFailedWrite(path);
 }