summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich2017-10-24 12:45:48 -0500
committerNick Kralevich2017-10-24 12:46:34 -0500
commit3d118e72dd352b1f12a35fd742c605c7eae4bcf5 (patch)
tree6de50c53bc4b18cfe38fe0fd23c63e718906a2b7 /logd/LogTags.cpp
parent1c65e77e6d73b9eee13d913e0b7886c72282e67f (diff)
downloadplatform-system-core-3d118e72dd352b1f12a35fd742c605c7eae4bcf5.tar.gz
platform-system-core-3d118e72dd352b1f12a35fd742c605c7eae4bcf5.tar.xz
platform-system-core-3d118e72dd352b1f12a35fd742c605c7eae4bcf5.zip
Don't use TEMP_FAILURE_RETRY on close()
See https://lkml.org/lkml/2005/9/10/129 for details. Bug: 20501816 Test: code compiles and boots with no obvious problems. Change-Id: I5a9c470156d498852cfd81fbd59ddcf267309e73
Diffstat (limited to 'logd/LogTags.cpp')
-rw-r--r--logd/LogTags.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/logd/LogTags.cpp b/logd/LogTags.cpp
index fcd45bd2b..ff7e76258 100644
--- a/logd/LogTags.cpp
+++ b/logd/LogTags.cpp
@@ -105,7 +105,7 @@ bool LogTags::RebuildFileEventLogTags(const char* filename, bool warn) {
105 android::base::WriteStringToFd( 105 android::base::WriteStringToFd(
106 formatEntry_locked(it.first, AID_ROOT), fd); 106 formatEntry_locked(it.first, AID_ROOT), fd);
107 } 107 }
108 TEMP_FAILURE_RETRY(close(fd)); 108 close(fd);
109 } 109 }
110 } 110 }
111 111
@@ -601,7 +601,7 @@ void LogTags::WriteDynamicEventLogTags(uint32_t tag, uid_t uid) {
601 601
602 std::string ret = formatEntry_locked(tag, uid, false); 602 std::string ret = formatEntry_locked(tag, uid, false);
603 android::base::WriteStringToFd(ret, fd); 603 android::base::WriteStringToFd(ret, fd);
604 TEMP_FAILURE_RETRY(close(fd)); 604 close(fd);
605 605
606 size_t size = 0; 606 size_t size = 0;
607 file2watermark_const_iterator iwater; 607 file2watermark_const_iterator iwater;
@@ -625,7 +625,7 @@ void LogTags::WriteDebugEventLogTags(uint32_t tag, uid_t uid) {
625 625
626 std::string ret = formatEntry_locked(tag, uid, false); 626 std::string ret = formatEntry_locked(tag, uid, false);
627 android::base::WriteStringToFd(ret, fd); 627 android::base::WriteStringToFd(ret, fd);
628 TEMP_FAILURE_RETRY(close(fd)); 628 close(fd);
629 629
630 size_t size = 0; 630 size_t size = 0;
631 file2watermark_const_iterator iwater; 631 file2watermark_const_iterator iwater;