summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-15 16:20:07 -0700
committerElliott Hughes <enh@google.com>2015-05-15 16:24:33 -0700
commitfa7ba6227f918dadca787a78ed3269bf86fd234d (patch)
treeb0e30496cba8873bfad4d4380fbbba5fb40897da /linker
parentff407803dbbee26ab19c02aaece0e75c019534c4 (diff)
downloadbionic-fa7ba6227f918dadca787a78ed3269bf86fd234d.zip
bionic-fa7ba6227f918dadca787a78ed3269bf86fd234d.tar.gz
bionic-fa7ba6227f918dadca787a78ed3269bf86fd234d.tar.bz2
Don't use TEMP_FAILURE_RETRY on close in bionic.
Bug: http://b/20501816 Change-Id: Id64b5109cc2b165fa0351b6edbb865a5e5058008 (cherry picked from commit 4e8ef698d0d76be3f8d75de32701e6e6327c1fbd)
Diffstat (limited to 'linker')
-rw-r--r--linker/linker.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9d796ae..33abfb4 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2429,8 +2429,7 @@ static int nullify_closed_stdio() {
/* If /dev/null is not one of the stdio file descriptors, close it. */
if (dev_null > 2) {
TRACE("[ Closing /dev/null file-descriptor=%d]", dev_null);
- status = TEMP_FAILURE_RETRY(close(dev_null));
- if (status == -1) {
+ if (close(dev_null) == -1) {
DL_ERR("close failed: %s", strerror(errno));
return_value = -1;
}