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.

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index f5b246b..d1072da 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -129,7 +129,7 @@ struct vop_vector coda_vnodeops = {
     .vop_readlink = coda_readlink,	/* readlink */
     .vop_inactive = coda_inactive,	/* inactive */
     .vop_reclaim = coda_reclaim,	/* reclaim */
-    ._vop_lock = coda_lock,		/* lock */
+    .vop_lock1 = coda_lock,		/* lock */
     .vop_unlock = coda_unlock,		/* unlock */
     .vop_bmap = coda_bmap,		/* bmap */
     .vop_print = VOP_PANIC,	/* print */
@@ -1627,7 +1627,7 @@ coda_reclaim(struct vop_reclaim_args *ap)
 }
 
 int
-coda_lock(struct _vop_lock_args *ap)
+coda_lock(struct vop_lock1_args *ap)
 {
 /* true args */
     struct vnode *vp = ap->a_vp;
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index fb79a18..5ea00918 100644
--- a/sys/fs/coda/coda_vnops.h
+++ b/sys/fs/coda/coda_vnops.h
@@ -72,7 +72,7 @@ vop_readdir_t coda_readdir;
 vop_bmap_t coda_bmap;
 vop_strategy_t coda_strategy;
 vop_reclaim_t coda_reclaim;
-_vop_lock_t coda_lock;
+vop_lock1_t coda_lock;
 vop_unlock_t coda_unlock;
 vop_islocked_t coda_islocked;
 int coda_vop_error(void *);
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index fb20667..9e9895c 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -510,7 +510,7 @@ null_rename(struct vop_rename_args *ap)
  * vnodes below us on the stack.
  */
 static int
-null_lock(struct _vop_lock_args *ap)
+null_lock(struct vop_lock1_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	int flags = ap->a_flags;
@@ -728,7 +728,7 @@ struct vop_vector null_vnodeops = {
 	.vop_getwritemount =	null_getwritemount,
 	.vop_inactive =		null_inactive,
 	.vop_islocked =		null_islocked,
-	._vop_lock =		null_lock,
+	.vop_lock1 =		null_lock,
 	.vop_lookup =		null_lookup,
 	.vop_open =		null_open,
 	.vop_print =		null_print,
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index eb78b98..45703be 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -57,7 +57,7 @@ SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
 static vop_generic_t	umap_bypass;
 static vop_getattr_t	umap_getattr;
 static vop_inactive_t	umap_inactive;
-static vop_lock_t	umap_lock;
+static vop_lock1_t	umap_lock;
 static vop_print_t	umap_print;
 static vop_reclaim_t	umap_reclaim;
 static vop_rename_t	umap_rename;
@@ -353,7 +353,7 @@ umap_getattr(ap)
  */
 static int
 umap_lock(ap)
-	struct vop_lock_args /* {
+	struct vop_lock1_args /* {
 		struct vnode *a_vp;
 		int a_flags;
 		struct thread *a_td;
@@ -525,7 +525,7 @@ static struct vop_vector umap_vnodeops = {
 
 	.vop_getattr =		umap_getattr,
 	.vop_inactive =		umap_inactive,
-	.vop_lock =		umap_lock,
+	.vop_lock1 =		umap_lock,
 	.vop_print =		umap_print,
 	.vop_reclaim =		umap_reclaim,
 	.vop_rename =		umap_rename,
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 42d6dce..134fe1c 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1630,7 +1630,7 @@ unionfs_get_llt_revlock(int flags)
 }
 
 static int
-unionfs_lock(struct _vop_lock_args *ap)
+unionfs_lock(struct vop_lock1_args *ap)
 {
 	int		error;
 	int		flags;
@@ -2256,7 +2256,7 @@ struct vop_vector unionfs_vnodeops = {
 	.vop_lease =		unionfs_lease,
 	.vop_link =		unionfs_link,
 	.vop_listextattr =	unionfs_listextattr,
-	._vop_lock =		unionfs_lock,
+	.vop_lock1 =		unionfs_lock,
 	.vop_lookup =		unionfs_lookup,
 	.vop_mkdir =		unionfs_mkdir,
 	.vop_mknod =		unionfs_mknod,