From owner-svn-src-all@FreeBSD.ORG  Tue Jan  4 05:35:20 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F12AE106564A;
	Tue,  4 Jan 2011 05:35:19 +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 E0B018FC12;
	Tue,  4 Jan 2011 05:35:19 +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 p045ZJFe023793;
	Tue, 4 Jan 2011 05:35:19 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p045ZJEu023791;
	Tue, 4 Jan 2011 05:35:19 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201101040535.p045ZJEu023791@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Tue, 4 Jan 2011 05:35:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216949 - head/lib/libthr/thread
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jan 2011 05:35:20 -0000

Author: davidxu
Date: Tue Jan  4 05:35:19 2011
New Revision: 216949
URL: http://svn.freebsd.org/changeset/base/216949

Log:
  Because sleepqueue may still being used, we should always check wchan with
  queue locked.

Modified:
  head/lib/libthr/thread/thr_cond.c

Modified: head/lib/libthr/thread/thr_cond.c
==============================================================================
--- head/lib/libthr/thread/thr_cond.c	Tue Jan  4 02:52:22 2011	(r216948)
+++ head/lib/libthr/thread/thr_cond.c	Tue Jan  4 05:35:19 2011	(r216949)
@@ -246,11 +246,6 @@ cond_wait_user(struct pthread_cond *cvp,
 			error = _thr_sleep(curthread, cvp->__clock_id, abstime);
 		}
 
-		if (curthread->wchan == NULL) {
-			error = 0;
-			goto out;
-		}
-
 		_sleepq_lock(cvp);
 		if (curthread->wchan == NULL) {
 			error = 0;
@@ -274,7 +269,6 @@ cond_wait_user(struct pthread_cond *cvp,
 		}
 	}
 	_sleepq_unlock(cvp);
-out:
 	curthread->mutex_obj = NULL;
 	_mutex_cv_lock(mp, recurse);
 	return (error);