From owner-svn-src-user@FreeBSD.ORG  Thu Nov  4 06:37:15 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 A81761065673;
	Thu,  4 Nov 2010 06:37: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 96DBB8FC12;
	Thu,  4 Nov 2010 06:37:15 +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 oA46bFEC046649;
	Thu, 4 Nov 2010 06:37:15 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA46bFIO046647;
	Thu, 4 Nov 2010 06:37:15 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201011040637.oA46bFIO046647@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Thu, 4 Nov 2010 06:37:15 +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: r214771 - user/davidxu/libthr/sys/kern
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: Thu, 04 Nov 2010 06:37:15 -0000

Author: davidxu
Date: Thu Nov  4 06:37:15 2010
New Revision: 214771
URL: http://svn.freebsd.org/changeset/base/214771

Log:
  Fix some comments. and ignore error code from umutex_unlock.

Modified:
  user/davidxu/libthr/sys/kern/kern_umtx.c

Modified: user/davidxu/libthr/sys/kern/kern_umtx.c
==============================================================================
--- user/davidxu/libthr/sys/kern/kern_umtx.c	Thu Nov  4 06:11:39 2010	(r214770)
+++ user/davidxu/libthr/sys/kern/kern_umtx.c	Thu Nov  4 06:37:15 2010	(r214771)
@@ -2538,8 +2538,10 @@ do_cv_wait(struct thread *td, struct uco
 	umtxq_unlock(&uq->uq_key);
 
 	error = do_unlock_umutex(td, m);
-	if (error)
+	if (error) {
 		UMTX_STATE_INC(cv_unlock_failure);
+		error = 0; /* ignore the error */
+	}
 	
 	umtxq_lock(&uq->uq_key);
 	if (error == 0) {
@@ -2617,7 +2619,7 @@ do_cv_wait(struct thread *td, struct uco
 	}
 	/*
 	 * Note that we should release a saved key, because if we
-	 * were migrated, the vmobject reference is no the original,
+	 * were migrated, the vmobject reference is no longer the original,
 	 * however, we should release the original.
 	 */
 	umtx_key_release(&savekey);
@@ -2722,7 +2724,7 @@ do_cv_signal(struct thread *td, struct u
 		if (!mkey.shared) {
 			owner = fuword32(__DEVOLATILE(void *,
 				&bind_mutex->m_owner));
-			 /*If mutex is not locked, wake up one */
+			 /* If mutex is not locked, wake up one. */
 			if ((owner & ~UMUTEX_CONTESTED) == 0) {
 				goto wake_one;
 			}