summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2005-04-12 05:43:03 +0000
committerjeff <jeff@FreeBSD.org>2005-04-12 05:43:03 +0000
commitb53ca6ad0a3ce1aebe08eb55116cb025a7266d42 (patch)
tree6871df25071b1824081ec75685222a655d8338c0 /sys
parenta76323e26fd7c992e42ffbe2063548de82693462 (diff)
downloadFreeBSD-src-b53ca6ad0a3ce1aebe08eb55116cb025a7266d42.zip
FreeBSD-src-b53ca6ad0a3ce1aebe08eb55116cb025a7266d42.tar.gz
- Differentiate two UPGRADE panics so I have a better idea of what's going
on here.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_lock.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 490244f..55acab6 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -268,8 +268,10 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line)
* after the upgrade). If we return an error, the file
* will always be unlocked.
*/
- if ((lkp->lk_lockholder == thr) || (lkp->lk_sharecount <= 0))
+ if (lkp->lk_lockholder == thr)
panic("lockmgr: upgrade exclusive lock");
+ if (lkp->lk_sharecount <= 0)
+ panic("lockmgr: upgrade without shared");
shareunlock(td, lkp, 1);
/*
* If we are just polling, check to see if we will block.
OpenPOWER on IntegriCloud