PERFORCE change 29123 for review

John Baldwin jhb at FreeBSD.org
Thu Apr 17 08:36:09 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=29123

Change 29123 by jhb at jhb_laptop on 2003/04/17 08:35:36

	This assert actually triggered while syncing buffers on shutdown, so
	make it into a printf instead of a panic so I don't lose my buffers.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_lock.c#25 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_lock.c#25 (text+ko) ====

@@ -229,10 +229,8 @@
 	error = 0;
 	if (td == NULL)
 		thr = LK_KERNPROC;
-	else {
-		MPASS(td == curthread);
+	else
 		thr = td;
-	}
 
 	if ((flags & LK_INTERNAL) == 0)
 		mtx_lock(lkp->lk_interlock);
@@ -267,6 +265,12 @@
 		 */
 		if (lkp->lk_lockholder != thr) {
 			lockflags = LK_HAVE_EXCL;
+#ifdef INVARIANTS
+			if (td != NULL && td != curthread)
+				printf("%s: weird thread pid %d (%s)\n",
+				    __func__, td->td_proc->p_pid,
+				    td->td_proc->p_comm);
+#endif
 			if (td != NULL && !(td->td_flags & TDF_DEADLKTREAT))
 				lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE;
 			error = acquire(&lkp, extflags, lockflags);


More information about the p4-projects mailing list