svn commit: r210844 - stable/6/sys/kern

[Attilio Rao]

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);