CVS commit: [netbsd-5] src/sys/kern

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Jul  1 22:32:42 UTC 2009

Modified Files:
        src/sys/kern [netbsd-5]: kern_rwlock.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #837):
        sys/kern/kern_rwlock.c: revision 1.31
lockdebug fixes for rw_tryupgrade/rw_downgrade.


To generate a diff of this commit:
cvs rdiff -u -r1.28.4.1 -r1.28.4.2 src/sys/kern/kern_rwlock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.28.4.1 src/sys/kern/kern_rwlock.c:1.28.4.2
--- src/sys/kern/kern_rwlock.c:1.28.4.1	Wed May 13 00:33:32 2009
+++ src/sys/kern/kern_rwlock.c	Wed Jul  1 22:32:42 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rwlock.c,v 1.28.4.1 2009/05/13 00:33:32 snj Exp $	*/
+/*	$NetBSD: kern_rwlock.c,v 1.28.4.2 2009/07/01 22:32:42 snj Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.28.4.1 2009/05/13 00:33:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.28.4.2 2009/07/01 22:32:42 snj Exp $");
 
 #define	__RWLOCK_PRIVATE
 
@@ -648,6 +648,7 @@
 		}
 	}
 
+	RW_WANTLOCK(rw, RW_READER, false);
 	RW_LOCKED(rw, RW_READER);
 	RW_DASSERT(rw, (rw->rw_owner & RW_WRITE_LOCKED) == 0);
 	RW_DASSERT(rw, RW_COUNT(rw) != 0);
@@ -666,7 +667,7 @@
 
 	curthread = (uintptr_t)curlwp;
 	RW_ASSERT(rw, curthread != 0);
-	RW_WANTLOCK(rw, RW_WRITER, true);
+	RW_ASSERT(rw, rw_read_held(rw));
 
 	for (owner = rw->rw_owner;; owner = next) {
 		RW_ASSERT(rw, (owner & RW_WRITE_LOCKED) == 0);
@@ -683,6 +684,7 @@
 	}
 
 	RW_UNLOCKED(rw, RW_READER);
+	RW_WANTLOCK(rw, RW_WRITER, true);
 	RW_LOCKED(rw, RW_WRITER);
 	RW_DASSERT(rw, rw->rw_owner & RW_WRITE_LOCKED);
 	RW_DASSERT(rw, RW_OWNER(rw) == curthread);