* mutex.c (__pthread_mutex_trylock): Only set mutex owner if we

	really own it.
	Patch by Kevin B. Hendricks" <khendricks@ivey.uwo.ca>.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b4bebf975b9303cd723a881a24259561bdcbbe8a..2f2ab954d04929deef98a95b45f4d484d2baef7a 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-31  Andreas Jaeger  <aj@suse.de>
+
+       * mutex.c (__pthread_mutex_trylock): Only set mutex owner if we
+       really own it.
+       Patch by Kevin B. Hendricks" <khendricks@ivey.uwo.ca>.
+
 2000-04-09  Ulrich Drepper  <drepper@redhat.com>
 
        * signals.c (sigaction): Fix return value for the case SIG is one

diff --git a/linuxthreads/mutex.c b/linuxthreads/mutex.c
index 5f0b81b7025716da106a5deba163799db2240606..ed1e7607c18c8c35c2e58427b128822718459ede 100644 (file)
--- a/linuxthreads/mutex.c
+++ b/linuxthreads/mutex.c
@@ -50,7 +50,8 @@ int __pthread_mutex_trylock(pthread_mutex_t * mutex)
   switch(mutex->__m_kind) {
   case PTHREAD_MUTEX_FAST_NP:
     retcode = __pthread_trylock(&mutex->__m_lock);
-    mutex->__m_owner = thread_self();
+    if (retcode == 0)
+      mutex->__m_owner = thread_self();
     return retcode;
   case PTHREAD_MUTEX_RECURSIVE_NP:
     self = thread_self();