d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove a stale comment.

Browse Source 
- Add an extra assertion in order to catch malformed requested operations.
This commit is contained in:
attilio 2008-04-12 13:56:17 +00:00
parent 4364cd23ef
commit 6c6f1ddb9c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_lock.c
View File

@ -319,6 +319,8 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk,
itimo = (timo == LK_TIMO_DEFAULT) ? lk->lk_timo : timo;
MPASS((flags & ~LK_TOTAL_MASK) == 0);
KASSERT((op & (op - 1)) == 0,
("%s: Invalid requested operation @ %s:%d", __func__, file, line));
KASSERT((flags & (LK_NOWAIT | LK_SLEEPFAIL)) == 0 ||
(op != LK_DOWNGRADE && op != LK_RELEASE),
("%s: Invalid flags in regard of the operation desired @ %s:%d",
@ -797,10 +799,6 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk,
panic("%s: unknown lockmgr request 0x%x\n", __func__, op);
}
/*
* We could have exited from the switch without reacquiring the
* interlock, so we need to check for the interlock ownership.
*/
if (flags & LK_INTERLOCK)
class->lc_unlock(ilk);