diff options
| author | jhb <jhb@FreeBSD.org> | 2013-09-04 11:52:28 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-09-04 11:52:28 +0000 |
| commit | 00a02e74da5ce54cb9325f0270ca4a3d24ea36d3 (patch) | |
| tree | 4f841bfe500c97433cbe6c0c90d83d97724f8250 | |
| parent | 150dbecd5fe09cb17ce379b60196bcb952366e5c (diff) | |
| download | FreeBSD-src-00a02e74da5ce54cb9325f0270ca4a3d24ea36d3.zip FreeBSD-src-00a02e74da5ce54cb9325f0270ca4a3d24ea36d3.tar.gz | |
Trim a couple of panic messages.
| -rw-r--r-- | sys/kern/subr_witness.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 37e8cf2..9d3040d 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1138,18 +1138,12 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, iclass = LOCK_CLASS(interlock); lock1 = find_instance(lock_list, interlock); if (lock1 == NULL) - kassert_panic( - "interlock (%s) %s not locked while locking" - " %s @ %s:%d", + kassert_panic("interlock (%s) %s not locked @ %s:%d", iclass->lc_name, interlock->lo_name, - flags & LOP_EXCLUSIVE ? "exclusive" : "shared", fixup_filename(file), line); else if ((lock1->li_flags & LI_RECURSEMASK) != 0) - kassert_panic( - "interlock (%s) %s recursed while locking %s" - " @ %s:%d", + kassert_panic("interlock (%s) %s recursed @ %s:%d", iclass->lc_name, interlock->lo_name, - flags & LOP_EXCLUSIVE ? "exclusive" : "shared", fixup_filename(file), line); } |
