From owner-svn-src-stable-8@FreeBSD.ORG  Wed May 30 01:54:15 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 73A63106564A;
	Wed, 30 May 2012 01:54:15 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D1538FC08;
	Wed, 30 May 2012 01:54:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4U1sFWe018160;
	Wed, 30 May 2012 01:54:15 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4U1sFCE018158;
	Wed, 30 May 2012 01:54:15 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201205300154.q4U1sFCE018158@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Wed, 30 May 2012 01:54:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236276 - stable/8/lib/libthr/thread
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 May 2012 01:54:15 -0000

Author: davidxu
Date: Wed May 30 01:54:14 2012
New Revision: 236276
URL: http://svn.freebsd.org/changeset/base/236276

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

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

Modified: stable/8/lib/libthr/thread/thr_mutex.c
==============================================================================
--- stable/8/lib/libthr/thread/thr_mutex.c	Wed May 30 01:52:53 2012	(r236275)
+++ stable/8/lib/libthr/thread/thr_mutex.c	Wed May 30 01:54:14 2012	(r236276)
@@ -484,6 +484,7 @@ mutex_self_trylock(struct pthread_mutex 
 	switch (m->m_type) {
 	case PTHREAD_MUTEX_ERRORCHECK:
 	case PTHREAD_MUTEX_NORMAL:
+	case PTHREAD_MUTEX_ADAPTIVE_NP:
 		ret = EBUSY; 
 		break;