- Add two new debugging macros: ASSERT_VI_LOCKED and ASSERT_VI_UNLOCKED

 - Use the new VI asserts in place of the old mtx_assert checks.
 - Add the VI asserts to the automated lock checking in the VOP calls.  The
   interlock should not be held across vops with a few exceptions.
 - Add the vop_(un)lock_{pre,post} functions to assert that interlock is held
   when LK_INTERLOCK is set.

1 files changed, 6 insertions, 2 deletions

diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index ce7c277..8971627 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -356,7 +356,9 @@ vop_reclaim {
 };
 
 #
-#% lock		vp	? ? ?
+#lock		vp	? ? ?
+#! lock		pre	vop_lock_pre
+#! lock		post	vop_lock_post
 #
 vop_lock {
 	IN struct vnode *vp;
@@ -365,7 +367,9 @@ vop_lock {
 };
 
 #
-#% unlock	vp	L ? L
+#unlock		vp	L ? L
+#! unlock	pre	vop_unlock_pre
+#! unlock	post	vop_unlock_post
 #
 vop_unlock {
 	IN struct vnode *vp;