From 60ec52511fdcf1bb51267b0b9da415fd568e7785 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 14 Oct 2016 17:57:19 +0200 Subject: Fix exec crash due to ext2fs This reverts part of a87bf9a8 for now. This fixes a crash in exec due to ext2fs, still to be investigated. * pthread/pt-exit.c (__pthread_exit): Use pthread_setcancelstate instead of __pthread_setcancelstate. --- pthread/pt-exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index b078db2..af75937 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -39,14 +39,14 @@ __pthread_exit (void *status) /* Run any cancelation handlers. According to POSIX, the cancellation cleanup handlers should be called with cancellation disabled. */ - __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate); + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate); for (handlers = __pthread_get_cleanup_stack (); *handlers; *handlers = (*handlers)->__next) (*handlers)->__handler ((*handlers)->__arg); - __pthread_setcancelstate (oldstate, &oldstate); + pthread_setcancelstate (oldstate, &oldstate); /* Decrease the number of threads. We use an atomic operation to make sure that only the last thread calls `exit'. */ -- cgit v1.2.3