aboutsummaryrefslogtreecommitdiff
path: root/nptl/allocatestack.c
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@codesourcery.com>2011-12-14 21:32:11 -0500
committerCarlos O'Donell <carlos@codesourcery.com>2011-12-14 21:32:11 -0500
commitcaafb2b06bb5ae71e1de719292a0b8a233a21757 (patch)
treea70bfeb2b335beebd50a64cbb8f84e2985806899 /nptl/allocatestack.c
parente988dba98d852d08707d00eec0072548fdf2eb24 (diff)
downloadglibc-caafb2b06bb5ae71e1de719292a0b8a233a21757.tar
glibc-caafb2b06bb5ae71e1de719292a0b8a233a21757.tar.gz
glibc-caafb2b06bb5ae71e1de719292a0b8a233a21757.tar.bz2
glibc-caafb2b06bb5ae71e1de719292a0b8a233a21757.zip
Return errno on failure in allocate_stack
In cases where a function call fails return errno and allow the caller to fixup the return code as required by their API.
Diffstat (limited to 'nptl/allocatestack.c')
-rw-r--r--nptl/allocatestack.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 36b4aa16fd..b1b17ceba7 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -435,7 +435,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
{
/* Something went wrong. */
assert (errno == ENOMEM);
- return EAGAIN;
+ return errno;
}
@@ -496,12 +496,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
if (__builtin_expect (mem == MAP_FAILED, 0))
- {
- if (errno == ENOMEM)
- __set_errno (EAGAIN);
-
- return errno;
- }
+ return errno;
/* SIZE is guaranteed to be greater than zero.
So we can never get a null pointer back from mmap. */
@@ -581,7 +576,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
/* Free the stack memory we just allocated. */
(void) munmap (mem, size);
- return EAGAIN;
+ return errno;
}
@@ -636,10 +631,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
#endif
if (mprotect (guard, guardsize, PROT_NONE) != 0)
{
- int err;
mprot_error:
- err = errno == ENOMEM ? EAGAIN : errno;
-
lll_lock (stack_cache_lock, LLL_PRIVATE);
/* Remove the thread from the list. */
@@ -657,7 +649,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
is nothing we could do. */
(void) munmap (mem, size);
- return err;
+ return errno;
}
pd->guardsize = guardsize;