svn commit: r243765 - stable/9/sys/kern

[Andriy Gapon]

Author: avg
Date: Sat Dec  1 19:05:30 2012
New Revision: 243765
URL: http://svnweb.freebsd.org/changeset/base/243765

Log:
  MFC r243271,243400: vnode_if: fix locking protocol description for
  lookup and cachedlookup

Modified:
  stable/9/sys/kern/vfs_subr.c
  stable/9/sys/kern/vnode_if.src
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_subr.c
==============================================================================
--- stable/9/sys/kern/vfs_subr.c	Sat Dec  1 18:16:14 2012	(r243764)
+++ stable/9/sys/kern/vfs_subr.c	Sat Dec  1 19:05:30 2012	(r243765)
@@ -4084,40 +4084,6 @@ vop_strategy_pre(void *ap)
 }
 
 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: stable/9/sys/kern/vnode_if.src
==============================================================================
--- stable/9/sys/kern/vnode_if.src	Sat Dec  1 18:16:14 2012	(r243764)
+++ stable/9/sys/kern/vnode_if.src	Sat Dec  1 19:05:30 2012	(r243765)
@@ -63,10 +63,8 @@ vop_islocked {
 	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 @@ vop_lookup {
 	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.