svn commit: r236275 - stable/9/lib/libthr/thread

[David Xu]

Author: davidxu
Date: Wed May 30 01:52:53 2012
New Revision: 236275
URL: http://svn.freebsd.org/changeset/base/236275

Log:
  MFC r236135:
  
  Return EBUSY for PTHREAD_MUTEX_ADAPTIVE_NP too when the mutex could not
  be acquired.
  
  PR:	168317

Modified:
  stable/9/lib/libthr/thread/thr_mutex.c
Directory Properties:
  stable/9/lib/libthr/   (props changed)

Modified: stable/9/lib/libthr/thread/thr_mutex.c
==============================================================================
--- stable/9/lib/libthr/thread/thr_mutex.c	Wed May 30 01:52:01 2012	(r236274)
+++ stable/9/lib/libthr/thread/thr_mutex.c	Wed May 30 01:52:53 2012	(r236275)
@@ -538,6 +538,7 @@ mutex_self_trylock(struct pthread_mutex 
 	switch (PMUTEX_TYPE(m->m_flags)) {
 	case PTHREAD_MUTEX_ERRORCHECK:
 	case PTHREAD_MUTEX_NORMAL:
+	case PTHREAD_MUTEX_ADAPTIVE_NP:
 		ret = EBUSY; 
 		break;