Update.

2000-03-16 Ulrich Drepper <drepper@redhat.com> * condvar.c: Make tests for ownership of mutex less strict.
git-mirror · Mar 16, 2000 · 13a8360 · 13a8360
1 parent ee5cda9
commit 13a8360
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* condvar.c: Make tests for ownership of mutex less strict.
+
 2000-03-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* condvar.c (pthread_cond_wait): Check whether mutex is owned by

diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
@@ -78,7 +78,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
   int already_canceled = 0;
 
   /* Check whether the mutex is locked and owned by this thread.  */
-  if (mutex->__m_owner != self)
+  if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self)
     return EINVAL;
 
   /* Set up extrication interface */
@@ -144,7 +144,7 @@ pthread_cond_timedwait_relative_old(pthread_cond_t *cond,
   pthread_extricate_if extr;
 
   /* Check whether the mutex is locked and owned by this thread.  */
-  if (mutex->__m_owner != self)
+  if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self)
     return EINVAL;
 
   /* Set up extrication interface */