diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-02-17 16:15:56 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-02-17 16:15:56 +0000 |
| commit | 9c09cd93597a91d6b0b59c8813be97d530e7551c (patch) | |
| tree | cd7ea8e6dc157e92ffd5f20dfa997e8be5b7da8b /nptl/pthread_mutex_destroy.c | |
| parent | 7d8db4cd587349f485fb85f4bea9e3011a3e55d7 (diff) | |
| download | glibc-9c09cd93597a91d6b0b59c8813be97d530e7551c.tar.gz glibc-9c09cd93597a91d6b0b59c8813be97d530e7551c.tar.xz glibc-9c09cd93597a91d6b0b59c8813be97d530e7551c.zip | |
Updated to fedora-glibc-20060217T1609
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; |