From owner-svn-src-user@FreeBSD.ORG  Fri Nov 12 07:34:52 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D4AC106564A;
	Fri, 12 Nov 2010 07:34:52 +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 5B0FE8FC17;
	Fri, 12 Nov 2010 07:34:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAC7Yq3w099714;
	Fri, 12 Nov 2010 07:34:52 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAC7Yqaf099712;
	Fri, 12 Nov 2010 07:34:52 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201011120734.oAC7Yqaf099712@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Fri, 12 Nov 2010 07:34:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215167 - user/davidxu/libthr/lib/libthr/thread
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 07:34:52 -0000

Author: davidxu
Date: Fri Nov 12 07:34:52 2010
New Revision: 215167
URL: http://svn.freebsd.org/changeset/base/215167

Log:
  In pthread_mutex_trylock, if the mutex is priority-protect or robust,
  always enters kernel to lock the mutex.

Modified:
  user/davidxu/libthr/lib/libthr/thread/thr_mutex.c

Modified: user/davidxu/libthr/lib/libthr/thread/thr_mutex.c
==============================================================================
--- user/davidxu/libthr/lib/libthr/thread/thr_mutex.c	Fri Nov 12 06:41:55 2010	(r215166)
+++ user/davidxu/libthr/lib/libthr/thread/thr_mutex.c	Fri Nov 12 07:34:52 2010	(r215167)
@@ -222,8 +222,6 @@ mutex_trylock_common(struct pthread_mute
 			      TID(curthread))
 				return mutex_self_trylock(mp);
 		}
-		if ((mp->__lockword & UMUTEX_OWNER_MASK) != 0)
-			return (EBUSY);
 		error = __thr_umutex_trylock((struct umutex *)&mp->__lockword);
 		if (error == 0 || error == EOWNERDEAD)
 			enqueue_mutex(curthread, mp);