[Midnightbsd-cvs] src [8476] trunk/sys/kern: fix locking protocol description for lookup and cached lookup

[laffer1 at midnightbsd.org]

Revision: 8476
          http://svnweb.midnightbsd.org/src/?rev=8476
Author:   laffer1
Date:     2016-09-18 18:28:18 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
fix locking protocol description for lookup and cached lookup

Modified Paths:
--------------
    trunk/sys/kern/vfs_subr.c
    trunk/sys/kern/vnode_if.src

Modified: trunk/sys/kern/vfs_subr.c
===================================================================
--- trunk/sys/kern/vfs_subr.c	2016-09-18 22:27:43 UTC (rev 8475)
+++ trunk/sys/kern/vfs_subr.c	2016-09-18 22:28:18 UTC (rev 8476)
@@ -4084,40 +4084,6 @@
 }
 
 void
-vop_lookup_pre(void *ap)
-{
-#ifdef DEBUG_VFS_LOCKS
-	struct vop_lookup_args *a;
-	struct vnode *dvp;
-
-	a = ap;
-	dvp = a->a_dvp;
-	ASSERT_VI_UNLOCKED(dvp, "VOP_LOOKUP");
-	ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP");
-#endif
-}
-
-void
-vop_lookup_post(void *ap, int rc)
-{
-#ifdef DEBUG_VFS_LOCKS
-	struct vop_lookup_args *a;
-	struct vnode *dvp;
-	struct vnode *vp;
-
-	a = ap;
-	dvp = a->a_dvp;
-	vp = *(a->a_vpp);
-
-	ASSERT_VI_UNLOCKED(dvp, "VOP_LOOKUP");
-	ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP");
-
-	if (!rc)
-		ASSERT_VOP_LOCKED(vp, "VOP_LOOKUP (child)");
-#endif
-}
-
-void
 vop_lock_pre(void *ap)
 {
 #ifdef DEBUG_VFS_LOCKS

Modified: trunk/sys/kern/vnode_if.src
===================================================================
--- trunk/sys/kern/vnode_if.src	2016-09-18 22:27:43 UTC (rev 8475)
+++ trunk/sys/kern/vnode_if.src	2016-09-18 22:28:18 UTC (rev 8476)
@@ -63,10 +63,8 @@
 	IN struct vnode *vp;
 };
 
-%% lookup	dvp	L ? ?
+%% lookup	dvp	L L L
 %% lookup	vpp	- L -
-%! lookup	pre	vop_lookup_pre
-%! lookup	post	vop_lookup_post
 
 # XXX - the lookup locking protocol defies simple description and depends
 #	on the flags and operation fields in the (cnp) structure.  Note
@@ -78,7 +76,7 @@
 	IN struct componentname *cnp;
 };
 
-%% cachedlookup	dvp	L ? ?
+%% cachedlookup	dvp	L L L
 %% cachedlookup	vpp	- L -
 
 # This must be an exact copy of lookup.  See kern/vfs_cache.c for details.