Since renaming of vop_lock to _vop_lock, pre- and post-condition

function calls are no more generated for vop_lock.
Rename _vop_lock to vop_lock1 to satisfy tools/vnode_if.awk assumption
about vop naming conventions. This restores pre/post-condition calls.

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index cc636a2..171ac20 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -86,7 +86,7 @@ struct vop_vector default_vnodeops = {
 	.vop_kqfilter =		vop_stdkqfilter,
 	.vop_islocked =		vop_stdislocked,
 	.vop_lease =		VOP_NULL,
-	._vop_lock =		vop_stdlock,
+	.vop_lock1 =		vop_stdlock,
 	.vop_lookup =		vop_nolookup,
 	.vop_open =		VOP_NULL,
 	.vop_pathconf =		VOP_EINVAL,
@@ -253,7 +253,7 @@ vop_stdpathconf(ap)
  */
 int
 vop_stdlock(ap)
-	struct _vop_lock_args /* {
+	struct vop_lock1_args /* {
 		struct vnode *a_vp;
 		int a_flags;
 		struct thread *a_td;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ce010b4..c65838f 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -3048,7 +3048,7 @@ static struct vop_vector sync_vnodeops = {
 	.vop_fsync =	sync_fsync,		/* fsync */
 	.vop_inactive =	sync_inactive,	/* inactive */
 	.vop_reclaim =	sync_reclaim,	/* reclaim */
-	._vop_lock =	vop_stdlock,	/* lock */
+	.vop_lock1 =	vop_stdlock,	/* lock */
 	.vop_unlock =	vop_stdunlock,	/* unlock */
 	.vop_islocked =	vop_stdislocked,	/* islocked */
 };
@@ -3555,7 +3555,7 @@ void
 vop_lock_pre(void *ap)
 {
 #ifdef DEBUG_VFS_LOCKS
-	struct _vop_lock_args *a = ap;
+	struct vop_lock1_args *a = ap;
 
 	if ((a->a_flags & LK_INTERLOCK) == 0)
 		ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK");
@@ -3568,7 +3568,7 @@ void
 vop_lock_post(void *ap, int rc)
 {
 #ifdef DEBUG_VFS_LOCKS
-	struct _vop_lock_args *a = ap;
+	struct vop_lock1_args *a = ap;
 
 	ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK");
 	if (rc == 0)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 64c0a4e..c0f179c 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -820,7 +820,7 @@ _vn_lock(struct vnode *vp, int flags, struct thread *td, char *file, int line)
 		 * lockmgr drops interlock before it will return for
 		 * any reason.  So force the code above to relock it.
 		 */
-		error = _VOP_LOCK(vp, flags | LK_INTERLOCK, td, file, line);
+		error = VOP_LOCK1(vp, flags | LK_INTERLOCK, td, file, line);
 		flags &= ~LK_INTERLOCK;
 		KASSERT((flags & LK_RETRY) == 0 || error == 0,
 		    ("LK_RETRY set with incompatible flags %d\n", flags));
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index d29043e..373b988 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -362,10 +362,10 @@ vop_reclaim {
 };
 
 
-%! lock		pre	vop_lock_pre
-%! lock		post	vop_lock_post
+%! lock1	pre	vop_lock_pre
+%! lock1	post	vop_lock_post
 
-_vop_lock {
+vop_lock1 {
 	IN struct vnode *vp;
 	IN int flags;
 	IN struct thread *td;