diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-02-15 17:20:33 +0000 |
| commit | 683040c3b2c7dc2bc08045202a0a0b46d143b3cb (patch) | |
| tree | fcd73510f2bcfcdf57078331d800db4217db759b /nptl/pthread_mutex_destroy.c | |
| parent | b007ce7cc6971e4bd4cd91c558efd3d4603d941d (diff) | |
| download | glibc-683040c3b2c7dc2bc08045202a0a0b46d143b3cb.tar.gz | |
* sysdeps/unix/sysv/linux/not-cancel.h (__openat_not_cancel,
__openat64_not_cancel): Remove prototypes.
(__openat_nocancel, __openat64_nocancel): New prototypes or defines.
(openat_not_cancel, openat_not_cancel_3, openat64_not_cancel,
openat64_not_cancel_3): Use them.
Diffstat (limited to 'nptl/pthread_mutex_destroy.c')
| -rw-r--r-- | nptl/pthread_mutex_destroy.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nptl/pthread_mutex_destroy.c b/nptl/pthread_mutex_destroy.c index 2bf76a9da3..19a647a846 100644 --- a/nptl/pthread_mutex_destroy.c +++ b/nptl/pthread_mutex_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -26,9 +26,17 @@ __pthread_mutex_destroy (mutex) pthread_mutex_t *mutex; { if (mutex->__data.__nusers != 0) - return EBUSY; + { + if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_PRIVATE_NP) != 0 + && (mutex->__data.__lock & FUTEX_OWNER_DIED) != 0 + && mutex->__data.__nusers == 1) + goto dead_robust_mutex; + + return EBUSY; + } /* Set to an invalid value. */ + dead_robust_mutex: mutex->__data.__kind = -1; return 0; |