From owner-svn-src-all@FreeBSD.ORG  Wed Aug  4 13:20:34 2010
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 BF2F11065675;
	Wed,  4 Aug 2010 13:20:34 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACF108FC29;
	Wed,  4 Aug 2010 13:20:34 +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 o74DKY9V080979;
	Wed, 4 Aug 2010 13:20:34 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o74DKYDK080978;
	Wed, 4 Aug 2010 13:20:34 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008041320.o74DKYDK080978@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 4 Aug 2010 13:20:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210844 - stable/6/sys/kern
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: Wed, 04 Aug 2010 13:20:34 -0000

Author: attilio
Date: Wed Aug  4 13:20:34 2010
New Revision: 210844
URL: http://svn.freebsd.org/changeset/base/210844

Log:
  MFC CVS r1.30:
  Remove a bogus KASSERT which will prevent rwlock to be acquired
  recursively in exclusive mode with debugging kernels.
  
  Reported by:	rwatson

Modified:
  stable/6/sys/kern/kern_rwlock.c

Modified: stable/6/sys/kern/kern_rwlock.c
==============================================================================
--- stable/6/sys/kern/kern_rwlock.c	Wed Aug  4 10:46:17 2010	(r210843)
+++ stable/6/sys/kern/kern_rwlock.c	Wed Aug  4 13:20:34 2010	(r210844)
@@ -152,9 +152,6 @@ _rw_wlock(struct rwlock *rw, const char 
 	MPASS(curthread != NULL);
 	KASSERT(rw->rw_lock != RW_DESTROYED,
 	    ("rw_wlock() of destroyed rwlock @ %s:%d", file, line));
-	KASSERT(rw_wowner(rw) != curthread,
-	    ("%s (%s): wlock already held @ %s:%d", __func__,
-	    rw->lock_object.lo_name, file, line));
 	WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file,
 	    line);
 	__rw_wlock(rw, curthread, file, line);