Date: Wed, 28 Jun 2006 01:09:11 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100180 for review Message-ID: <200606280109.k5S19B5Y029838@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100180 Change 100180 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 01:08:31 Whoops! Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 (text+ko) ==== @@ -160,8 +160,8 @@ thr = td; lock_profile_waitstart(&waitstart); - if ((flags & LK_INTERNAL) == 0) - mtx_lock(lkp->lk_interlock); + mtx_lock(lkp->lk_interlock); + CTR6(KTR_LOCK, "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), owner == %p, exclusivecount == %d, flags == 0x%x, " "td == %p", lkp, lkp->lk_wmesg, lkp->lk_lockholder, @@ -174,6 +174,10 @@ } #endif + if (flags & LK_INTERLOCK) { + mtx_assert(interlkp, MA_OWNED | MA_NOTRECURSED); + mtx_unlock(interlkp); + } if ((flags & (LK_NOWAIT|LK_RELEASE)) == 0) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &lkp->lk_interlock->mtx_object,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606280109.k5S19B5Y029838>